cleanup release tests a bit.

1 files changed, 6 insertions, 11 deletions

diff --git a/docs/releasetests.sh b/docs/releasetests.sh
index f46ef0d..b4269de 100755
--- a/docs/releasetests.sh
+++ b/docs/releasetests.sh
@@ -5,8 +5,7 @@
 # release. The basic idea is:
 
 # 1) make distcheck to ensure that all autoconf stuff is setup properly
-# 2) build and install mock rpm.
-# 3) then use that version of mock to recompile the mock srpm for all supported distros.
+# 2) rebuild mock srpm using this version of mock under all distributed configs
 
 # This test will only run on a machine with full access to internet.
 # might work with http_proxy= env var, but I havent tested that.
@@ -18,23 +17,19 @@ DIR=$(cd $(dirname $0); pwd)
 TOP_SRCTREE=$DIR/../
 cd $TOP_SRCTREE
 
-make distclean ||:
+make distcheck ||:
 ./configure
-make distcheck
-make
-make rpm
+make srpm
+make src/daemontest
 
 sudo rm -rf $TOP_SRCTREE/mock-unit-test
 for i in $(ls etc/mock | grep .cfg | grep -v default | grep -v ppc); do
     time sudo ./py/mock.py --resultdir=$TOP_SRCTREE/mock-unit-test --uniqueext=unittest rebuild mock-*.src.rpm  -r $(basename $i .cfg)
 done
 
-# test orphanskill
-gcc -o docs/daemontest docs/daemontest.c
-
 (pgrep daemontest && echo "Exiting because there is already a daemontest running." && exit 1) || :
-testConfig=fedora-7-x86_64
+testConfig=fedora-8-x86_64
 sudo ./py/mock.py -r $testConfig --resultdir=$TOP_SRCTREE/mock-unit-test init
-cp docs/daemontest /var/lib/mock/$testConfig/root/tmp/
+cp src/daemontest /var/lib/mock/$testConfig/root/tmp/
 sudo ./py/mock.py -r $testConfig --resultdir=$TOP_SRCTREE/mock-unit-test --no-clean -- chroot /tmp/daemontest
 (pgrep daemontest && echo "Daemontest FAILED. found a daemontest process running after exit." && exit 1) || :