Build/testsuite adjustments

- increase CPU time limit to about 2 min
 - tests also depend on the startup configuration

SConstruct

@@ -347,10 +347,12 @@ def defineBuildTargets(env, artifacts):
     
     artifacts['corelib'] = core
     artifacts['support'] = lLib
-    artifacts['lumiera'] = ( env.Program('lumiera', ['src/lumiera/main.cpp'], LIBS=core, install=True)
-                           + env.ConfigData(env.path.srcConf+'setup.ini', targetDir='$ORIGIN')
+    artifacts['config']  = ( env.ConfigData(env.path.srcConf+'setup.ini', targetDir='$ORIGIN')
                            + env.ConfigData(env.path.srcConf+'dummy_lumiera.ini')
                            )
+    artifacts['lumiera'] = ( env.Program('lumiera', ['src/lumiera/main.cpp'], LIBS=core, install=True)
+                           + artifacts['config']
+                           )
     
     # building Lumiera Plugins
     artifacts['plugins'] = [] # currently none 

tests/SConscript

@@ -59,6 +59,7 @@ artifacts['testsuite'] = ts = ( [ testExecutable(env, dir) for dir in ['lib','co
                               + [ testCollection(env, dir) for dir in moduledirs if not dir in specials]
                               + createPlugins(env, 'plugin')
                               + env.File(glob('*.tests'))     # depending on the test definition files for test.sh
+                              + artifacts['config']
                               )
 
 

tests/test.conf

@@ -1,4 +1,5 @@
 LOGSUPPRESS='^\(\*\*[0-9]*\*\* \)\?[0-9]\{10,\}[:!] \(TRACE\|INFO\|NOTICE\|WARNING\|ERR\|TODO\|PLANNED\|FIXME\|DEPRECATED\|UNIMPLEMENTED\|RESOURCE_ANNOUNCE\|RESOURCE_ENTER\|RESOURCE_STATE\|RESOURCE_LEAVE\):'
 
-LIMIT_VG_CPU=55
-LIMIT_VG_TIME=60
+LIMIT_CPU=120
+LIMIT_VG_CPU=115
+LIMIT_VG_TIME=120

tests/test.sh

@@ -134,6 +134,7 @@ fi
 #valgrind false positives in 'vgsuppression'. Care must be taken that this file is simple and does
 #valgrind not generate true positives.
 #valgrind
+echo "NOTE: CPU time limit: $LIMIT_CPU sec"
 ulimit -S -t ${LIMIT_CPU:-5} -v ${LIMIT_VSZ:-524288}
 valgrind=""
 LIMIT_TIME_REAL="$LIMIT_TIME"