Avoid issues if multiple Python versions are used
authorTom Henderson <tomh@tomh.org>
Sun, 16 Jun 2019 02:19:26 -0700
changeset 62 bffa1e045112
parent 61 317e1a2db131
child 63 476aae6d63ad
Avoid issues if multiple Python versions are used
daily-with-valgrind/script
daily-without-valgrind/script
osx-mlion-ns-3-allinone/script
--- a/daily-with-valgrind/script	Tue Jun 11 13:22:02 2019 -0700
+++ b/daily-with-valgrind/script	Sun Jun 16 02:19:26 2019 -0700
@@ -1,11 +1,11 @@
 set -x verbose #echo on
-rm -rf * || exit $?
+rm -rf ns-3-allinone || exit $?
 time git clone https://gitlab.com/nsnam/ns-3-allinone.git || exit $?
 cd ns-3-allinone || exit $?
 time ./download.py || exit $?
 ./build.py --enable-examples --enable-tests || exit $?
 cd ns-3-dev || exit $?
-./waf clean || exit $?
+rm -rf build
 # Reconfigure and use valgrind
 ./waf -d debug configure --enable-examples --enable-tests --disable-gtk --with-openflow=/home/buildslave/jenkins/openflow --with-nsclick=/home/buildslave/jenkins/click --enable-mpi || exit $?
 ./waf || exit $?
--- a/daily-without-valgrind/script	Tue Jun 11 13:22:02 2019 -0700
+++ b/daily-without-valgrind/script	Sun Jun 16 02:19:26 2019 -0700
@@ -1,11 +1,11 @@
 set -x verbose #echo on
-rm -rf * || exit $?
+rm -rf ns-3-allinone || exit $?
 time git clone https://gitlab.com/nsnam/ns-3-allinone.git || exit $?
 cd ns-3-allinone || exit $?
 time ./download.py || exit $?
 ./build.py --enable-examples --enable-tests || exit $?
 cd ns-3-dev || exit $?
-./waf clean || exit $?
+rm -rf build
 ./waf -d debug configure --enable-examples --enable-tests --enable-mpi || exit $?
 ./waf || exit $?
 ./test.py || exit $?
--- a/osx-mlion-ns-3-allinone/script	Tue Jun 11 13:22:02 2019 -0700
+++ b/osx-mlion-ns-3-allinone/script	Sun Jun 16 02:19:26 2019 -0700
@@ -1,11 +1,11 @@
 set -x verbose #echo on
-rm -rf *
+rm -rf ns-3-allione
 git clone https://gitlab.com/nsnam/ns-3-allinone.git || exit $?
 cd ns-3-allinone || exit $?
 ./download.py || exit $?
 ./build.py --enable-examples --enable-tests || exit $?
 cd ns-3-dev || exit $?
-./waf clean || exit $?
+rm -rf build
 ./waf -d debug configure --enable-examples --enable-tests --with-nsclick=$HOME/ns-3-packages/click --with-openflow=$HOME/ns-3-packages/openflow --enable-mpi || exit $?
 ./waf || exit $?
 ./waf -d optimized configure --enable-examples --enable-tests --with-nsclick=$HOME/ns-3-packages/click --with-openflow=$HOME/ns-3-packages/openflow --enable-mpi || exit $?