diff options
| author | Reto Buerki <reet@codelabs.ch> | 2012-12-06 11:27:06 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2013-01-17 15:22:09 +0100 |
| commit | 6022f37aec4480b725e5a9915460d71aabdc94ef (patch) | |
| tree | f78b94ba950a73013d019a0f178e0386383c5d5e | |
| parent | 18bce26ea663dfd20efe8505c36a5537979a7c8d (diff) | |
| download | strongswan-6022f37aec4480b725e5a9915460d71aabdc94ef.tar.bz2 strongswan-6022f37aec4480b725e5a9915460d71aabdc94ef.tar.xz | |
Simplify test starting and stopping logic
Reduce the coupling of the different scripts.
make-testing : Build the testing environment
start-testing : Start switches and guests
do-tests : Run tests
stop-testing : Stop switches and guests
| -rwxr-xr-x | testing/make-testing | 9 | ||||
| -rwxr-xr-x | testing/start-testing | 22 | ||||
| -rwxr-xr-x | testing/stop-testing | 2 | ||||
| -rwxr-xr-x | testing/testing.conf | 3 |
4 files changed, 0 insertions, 36 deletions
diff --git a/testing/make-testing b/testing/make-testing index 42f089e88..7ae39eb6e 100755 --- a/testing/make-testing +++ b/testing/make-testing @@ -78,12 +78,3 @@ then cecho "Building uml host images (scripts/build-umlhostfs)" $DIR/scripts/build-umlhostfs $HOSTS fi - -########################################################################## -# Start up the UML switches and designated UML instances -# -if [ $ENABLE_START_TESTING = "yes" ] -then - cecho "Starting the uml switches and instances (start-testing)" - $DIR/start-testing $HOSTS -fi diff --git a/testing/start-testing b/testing/start-testing index ab8b96006..1fc4dd8bc 100755 --- a/testing/start-testing +++ b/testing/start-testing @@ -42,25 +42,3 @@ $DIR/scripts/start-bridges # cecho "Start the uml instances (scripts/start-umls)" $DIR/scripts/start-umls $HOSTS - - -##################################################### -# do the automated testing -# -if [ $ENABLE_DO_TESTS = "yes" ] -then - cecho "Run the automated tests (do-tests)" - $DIR/do-tests -fi - - -############################################################################## -# stop all UML instances and switches -# - -if [ $ENABLE_STOP_TESTING = "yes" ] -then - cecho "Stopping all UML instances and switches (stop-testing)" - $DIR/stop-testing $HOSTS -fi - diff --git a/testing/stop-testing b/testing/stop-testing index 023a5b39e..e6ee884d1 100755 --- a/testing/stop-testing +++ b/testing/stop-testing @@ -44,5 +44,3 @@ cgecho "done" # cecho "Stop the uml bridges (scripts/stop-bridges)" $DIR/scripts/stop-bridges - - diff --git a/testing/testing.conf b/testing/testing.conf index a931155ca..6bb97dd7f 100755 --- a/testing/testing.conf +++ b/testing/testing.conf @@ -76,9 +76,6 @@ ENABLE_BUILD_UMLKERNEL="yes" ENABLE_BUILD_UMLROOTFS="yes" ENABLE_BUILD_HOSTCONFIG="yes" ENABLE_BUILD_UMLHOSTFS="yes" -ENABLE_START_TESTING="yes" -ENABLE_DO_TESTS="no" -ENABLE_STOP_TESTING="no" ############################################################## # If set to "yes" only the tests stated at $SELECTEDTESTS |