From: Reto Buerki <reet@codelabs.ch>
Date: Thu, 6 Dec 2012 10:27:06 +0000 (+0100)
Subject: Simplify test starting and stopping logic
X-Git-Tag: 5.0.2rc1~1^2~91
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6022f37aec4480b725e5a9915460d71aabdc94ef;p=thirdparty%2Fstrongswan.git

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
---

diff --git a/testing/make-testing b/testing/make-testing
index 42f089e882..7ae39eb6ef 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 ab8b96006b..1fc4dd8bce 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 023a5b39e9..e6ee884d16 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 a931155cac..6bb97dd7f9 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