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
This commit is contained in:
committed by
Tobias Brunner
parent
18bce26ea6
commit
6022f37aec
@@ -78,12 +78,3 @@ then
|
|||||||
cecho "Building uml host images (scripts/build-umlhostfs)"
|
cecho "Building uml host images (scripts/build-umlhostfs)"
|
||||||
$DIR/scripts/build-umlhostfs $HOSTS
|
$DIR/scripts/build-umlhostfs $HOSTS
|
||||||
fi
|
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
|
|
||||||
|
|||||||
@@ -42,25 +42,3 @@ $DIR/scripts/start-bridges
|
|||||||
#
|
#
|
||||||
cecho "Start the uml instances (scripts/start-umls)"
|
cecho "Start the uml instances (scripts/start-umls)"
|
||||||
$DIR/scripts/start-umls $HOSTS
|
$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
|
|
||||||
|
|
||||||
|
|||||||
@@ -44,5 +44,3 @@ cgecho "done"
|
|||||||
#
|
#
|
||||||
cecho "Stop the uml bridges (scripts/stop-bridges)"
|
cecho "Stop the uml bridges (scripts/stop-bridges)"
|
||||||
$DIR/scripts/stop-bridges
|
$DIR/scripts/stop-bridges
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -76,9 +76,6 @@ ENABLE_BUILD_UMLKERNEL="yes"
|
|||||||
ENABLE_BUILD_UMLROOTFS="yes"
|
ENABLE_BUILD_UMLROOTFS="yes"
|
||||||
ENABLE_BUILD_HOSTCONFIG="yes"
|
ENABLE_BUILD_HOSTCONFIG="yes"
|
||||||
ENABLE_BUILD_UMLHOSTFS="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
|
# If set to "yes" only the tests stated at $SELECTEDTESTS
|
||||||
|
|||||||
Reference in New Issue
Block a user