Index: tests/fdktestqa/fdk.config ================================================================== --- tests/fdktestqa/fdk.config +++ tests/fdktestqa/fdk.config @@ -1,8 +1,11 @@ [fields] SYSTEM TEXT RELEASE TEXT + +[pre-launch-env-overrides] +MAX_ALLOWED_LOAD 200 [setup] # Adjust max_concurrent_jobs to limit how much you load your machines # max_concurrent_jobs 150 max_concurrent_jobs 500 Index: tests/fdktestqa/testqa/Makefile ================================================================== --- tests/fdktestqa/testqa/Makefile +++ tests/fdktestqa/testqa/Makefile @@ -28,7 +28,7 @@ compile : (cd ../../..;make -j && make install) clean : - rm -rf ../simple*/*/* megatest.db db/* + rm -rf ../simple*/*/* megatest.db db/* ../simple*/.db/* Index: tests/fdktestqa/testqa/megatest.config ================================================================== --- tests/fdktestqa/testqa/megatest.config +++ tests/fdktestqa/testqa/megatest.config @@ -5,7 +5,5 @@ [jobtools] launcher loadrunner [include ../fdk.config] -[server] -port 9080 Index: tests/fullrun/megatest.config ================================================================== --- tests/fullrun/megatest.config +++ tests/fullrun/megatest.config @@ -84,12 +84,11 @@ # These are set before all tests, override them # in the testconfig [pre-launch-env-overrides] section [env-override] # This variable is honored by the loadrunner script. The value is in percent -# a value of 200 will stop new jobs from starting. -MAX_ALLOWED_LOAD 150 +MAX_ALLOWED_LOAD 200 # MT_XTERM_CMD overrides the terminal command # MT_XTERM_CMD xterm -bg lightgreen -fg black SPECIAL_ENV_VARS overide them here - should be seen at launch and in the runs @@ -122,11 +121,11 @@ port 8080 # This server will keep running this number of hours after last access. # Three minutes is 0.05 hours # timeout 0.025 -timeout 0.025 +timeout 0.5 ## disks are: ## name host:/path/to/area ## -or- ## name /path/to/area Index: utils/loadrunner ================================================================== --- utils/loadrunner +++ utils/loadrunner @@ -45,11 +45,11 @@ # NB// max_load is in units of percent. # lperc=$(echo "100 * $load / $numcpu"|bc) lperc2=$(echo "100 * $load2 / $numcpu"|bc) -let lperc2adj="$lperc2 + 0.5" +let "lperc2adj=$lperc2 + 1" if [[ "x$MAX_ALLOWED_LOAD" == "x" ]]; then max_load=100 else max_load=$MAX_ALLOWED_LOAD fi