Merge Pull Request #2381 from hughes-c/sst-elements/hughes/vanadis-te…

…sts-fix

Automatically Merged using SST Pull Request AutoTester
PR Title: b'Fixes for Vanadis Config Scripts'
PR Author: hughes-c

src/sst/elements/vanadis/tests/basic_vanadis.py

@@ -145,18 +145,13 @@
     "checkpoint" : checkpoint
 }
 
-
 processList = ( 
     ( 1, {
         "env_count" : 1,
         "env0" : "OMP_NUM_THREADS={}".format(numCpus*numThreads),
         "exe" : full_exe_name,
         "arg0" : exe_name,
     } ),
-    #( 1, {
-    #    "env_count" : 2, "env0" : "HOME=/home/sdhammo", "env1" : "NEWHOME=/home/sdhammo2", "argc" : 1, "exe" : "./tests/small/basic-io/hello-world/mipsel/hello-world",  
-        #"exe" : "./tests/small/basic-io/read-write/mipsel/read-write",  
-    #} ),
 )
 
 processList[0][1].update(app_params)

src/sst/elements/vanadis/tests/boom_vanadis-kingsley.py

@@ -16,14 +16,16 @@
 
 loader_mode = os.getenv("VANADIS_LOADER_MODE", "0")
 
-#testDir="basic-io"
-#exe = "hello-world"
+testDir="basic-io"
+exe = "hello-world"
 #exe = "hello-world-cpp"
 #exe = "openat"
 #exe = "printf-check"
 #exe = "read-write"
+#exe = "fread-fwrite"
 #exe = "unlink"
 #exe = "unlinkat"
+#exe = "lseek"
 
 #testDir = "basic-math"
 #exe = "sqrt-double"
@@ -33,17 +35,20 @@
 #exe = "test-branch"
 #exe = "test-shift"
 
-testDir = "misc"
+#testDir = "misc"
 #exe = "mt-dgemm"
-exe = "stream"
+#exe = "stream"
 #exe = "stream-fortran"
 #exe = "gettime"
 #exe = "splitLoad"
 #exe = "fork"
 #exe = "clone"
 #exe = "pthread"
 #exe = "openmp"
+#exe = "openmp2"
 #exe = "uname"
+#exe = "mem-test"
+#exe = "checkpoint"
 
 physMemSize = "4GiB"
 
@@ -171,23 +176,20 @@
     "page_size"  : 4096,
     "physMemSize" : physMemSize,
     "useMMU" : True,
+    "checkpointDir" : checkpointDir,
+    "checkpoint" : checkpoint
 }
 
-
 processList = (
     ( 1, {
         "env_count" : 1,
-        "env0" : "OMP_NUM_THREADS={}".format(numCpus),
+        "env0" : "OMP_NUM_THREADS={}".format(numCpus*numThreads),
         "exe" : full_exe_name,
         "arg0" : exe_name,
     } ),
-    #( 1, {
-    #    "env_count" : 2, "env0" : "HOME=/home/sdhammo", "env1" : "NEWHOME=/home/sdhammo2", "argc" : 1, "exe" : "./tests/small/basic-io/hello-world/mipsel/hello-world",
-        #"exe" : "./tests/small/basic-io/read-write/mipsel/read-write",
-    #} ),
 )
 
-procssList[0][1].update(app_params)
+processList[0][1].update(app_params)
 
 osl1cacheParams = {
     "access_latency_cycles" : "2",