Move htest/ files under the test/ tree

[ganeti-local] / autotools / run-in-tempdir

diff --git a/autotools/run-in-tempdir b/autotools/run-in-tempdir
index 86f6439..1289783 100755 (executable)
--- a/autotools/run-in-tempdir
+++ b/autotools/run-in-tempdir
@@ -8,26 +8,25 @@ set -e
 tmpdir=$(mktemp -d -t gntbuild.XXXXXXXX)
 trap "rm -rf $tmpdir" EXIT
 
-mkdir $tmpdir/doc
+# fully copy items
+cp -r autotools daemons scripts lib tools qa $tmpdir
 
-cp -r autotools daemons scripts lib tools test qa $tmpdir
+mkdir $tmpdir/doc
 ln -s $PWD/doc/examples $tmpdir/doc
 
+mkdir $tmpdir/test/
+cp -r test/py $tmpdir/test/py
+ln -s $PWD/test/data $tmpdir/test
+ln -s $PWD/test/hs $tmpdir/test
+
 mv $tmpdir/lib $tmpdir/ganeti
 ln -T -s $tmpdir/ganeti $tmpdir/lib
 
-mkdir -p $tmpdir/src $tmpdir/htest
+mkdir -p $tmpdir/src $tmpdir/test/hs
 for hfile in htools ganeti-confd mon-collector; do
   if [ -e src/$hfile ]; then
     ln -s $PWD/src/$hfile $tmpdir/src/
   fi
 done
 
-for hfile in hpc-htools test offline-test.sh cli-tests-defs.sh \
-  hbal hscan hspace hinfo hcheck hail hroller hpc-mon-collector; do
-  if [ -e htest/$hfile ]; then
-    ln -s $PWD/htest/$hfile $tmpdir/htest/
-  fi
-done
-
 cd $tmpdir && GANETI_TEMP_DIR="$tmpdir" "$@"