3 files changed, 14 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index 4d26fe5..3f2f033 100644
--- a/Makefile
+++ b/Makefile
@@ -5,18 +5,18 @@
 
 all-64:
         @echo "Legacy warning: Building is done with scons."
-        ARCH=x86_64 scons ${DEBUG}
+        ARCH=x86_64 scons ${DEBUG} DEFINE=${DEFINE}
         mv libpm.so pm.so
         @echo "Done"
 
 all-32:
         @echo "Legacy warning: Building is done with scons."
-        ARCH=x86 scons ${DEBUG}
+        ARCH=x86 scons ${DEBUG} DEFINE=${DEFINE}
         mv libpm.so pm.so
         @echo "Done"
 
 all-sparc:
-        ARCH=sparc64 scons ${DEBUG}
+        ARCH=sparc64 scons ${DEBUG} DEFINE=${DEFINE}
 
 clean:
         @echo "Legacy warning: Building is now done with scons."
diff --git a/SConstruct b/SConstruct
index 5f12f62..7f8a6e3 100644
--- a/SConstruct
+++ b/SConstruct
@@ -60,6 +60,10 @@ if arch not in SUPPORTED_ARCHS:
 else:
     arch_flags = Split(SUPPORTED_ARCHS[arch])
 
+# add environment defined -D flags
+if 'DEFINE' in ARGUMENTS:
+    API_FLAGS = API_FLAGS + ' ' + ARGUMENTS['DEFINE']
+
 # add architecture dependent include search path
 if arch in ['x86','x86_64']:
     include_arch = 'x86'
diff --git a/include/pm_common.h b/include/pm_common.h
index 974dc9a..57ff4d2 100644
--- a/include/pm_common.h
+++ b/include/pm_common.h
@@ -27,8 +27,13 @@
  * each round (easier for memory management), but running all test
  * without human intervention
  */
-/* working set size, in KB */
+/*
+ * default working set size, in KB
+ * non-default WSS are taken from the test script (DEFINE=-DWSS=...)
+ */
+#ifndef WSS
 #define WSS     1024
+#endif
 /* Cache size:
  * Niagara: L2: 3MB
  * Koruna: L2: 6MB every 2 cores
@@ -55,7 +60,7 @@
 /* number of "working sets" to cycle through */
 #define NUMWS           ((CACHESIZE*2)/WSS)+2
 /* runtime in milliseconds -- 60s*/
-#define SIMRUNTIME      15000
+#define SIMRUNTIME      60000
 /* times to read warm memory to get accurate data */
 #define REFTOTAL        3