[xorg-x11-server] Don't bother trying to build the unit tests for now
Adam Jackson
ajax at fedoraproject.org
Thu Nov 7 13:22:30 UTC 2013
commit f936b2f162239bdeb4afa4e55a0c8b5737bbe007
Author: Adam Jackson <ajax at redhat.com>
Date: Thu Nov 7 08:22:45 2013 -0500
Don't bother trying to build the unit tests for now
driver-abi-rebuild.sh | 14 +++++++-------
xorg-x11-server.spec | 4 ++++
2 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/driver-abi-rebuild.sh b/driver-abi-rebuild.sh
index 576d5e0..80750f0 100755
--- a/driver-abi-rebuild.sh
+++ b/driver-abi-rebuild.sh
@@ -5,10 +5,10 @@
builddir="abi-rebuild"
-#if [ -e "$builddir" ]; then
-# echo "Path '$builddir' exists. Move out of the way first"
-# exit 1
-#fi
+if [ -e "$builddir" ]; then
+ echo "Path '$builddir' exists. Move out of the way first"
+ exit 1
+fi
mkdir -p $builddir
pushd $builddir
@@ -39,10 +39,10 @@ echo $driverlist $extradrivers | xargs -n1 $pkg co $branch
for i in xorg-x11-drv-*/ ; do
[ -e $i/dead.package ] && continue
pushd $i
- rpmdev-bumpspec -c "- ABI rebuild" *.spec
- #$pkg commit -c -p && $pkg build --nowait
+ rpmdev-bumpspec -c "- 1.15RC1 ABI rebuild" *.spec
+ $pkg commit -c -p && $pkg build --nowait
#$pkg mockbuild
- $pkg srpm
+ #$pkg srpm
#mockchain -r fedora-20-x86_64 -l $OLDPWD
#mockchain -r rhel-7.0-candidate-x86_64 -l $OLDPWD
popd
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index c020ff0..dca6c0e 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -458,6 +458,7 @@ autoreconf -f -v --install || exit 1
--disable-linux-acpi --disable-linux-apm \
--enable-xselinux --enable-record \
--enable-config-udev \
+ --disable-unit-tests \
%{?wayland} \
%{dri_flags} %{?bodhi_flags} \
${CONFIGURE}
@@ -646,6 +647,9 @@ rm -rf $RPM_BUILD_ROOT
%{xserver_source_dir}
%changelog
+* Thu Nov 07 2013 Adam Jackson <ajax at redhat.com
+- Don't bother trying to build the unit tests for now
+
* Wed Nov 06 2013 Adam Jackson <ajax at redhat.com> 1.14.99.901-1
- 1.15RC1
More information about the scm-commits
mailing list