diff --git a/src/sst/elements/ariel/tests/testsuite_default_Ariel.py b/src/sst/elements/ariel/tests/testsuite_default_Ariel.py index 92e00ac417..de32eaefee 100644 --- a/src/sst/elements/ariel/tests/testsuite_default_Ariel.py +++ b/src/sst/elements/ariel/tests/testsuite_default_Ariel.py @@ -4,36 +4,13 @@ from sst_unittest_support import * import os -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - try: - # Put your single instance Init Code Here - class_inst._setup_ariel_test_files() - except: - pass - module_init = 1 - module_sema.release() - -################################################################################ -################################################################################ -################################################################################ class testcase_Ariel(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) # Put test based setup code here. it is called once before every test + self._setup_ariel_test_files() def tearDown(self): # Put test based teardown code here. it is called once after every test diff --git a/src/sst/elements/ariel/tests/testsuite_testio_Ariel.py b/src/sst/elements/ariel/tests/testsuite_testio_Ariel.py index 9b7f1d59cc..d884f1423c 100644 --- a/src/sst/elements/ariel/tests/testsuite_testio_Ariel.py +++ b/src/sst/elements/ariel/tests/testsuite_testio_Ariel.py @@ -5,37 +5,13 @@ import os import inspect -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - try: - # Put your single instance Init Code Here - class_inst._setup_ariel_test_files() - except: - pass - module_init = 1 - module_sema.release() - -################################################################################ -################################################################################ -################################################################################ - class testcase_Ariel(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) # Put test based setup code here. it is called once before every test + self._setup_ariel_test_files() def tearDown(self): # Put test based teardown code here. it is called once after every test diff --git a/src/sst/elements/balar/tests/testsuite_default_balar.py b/src/sst/elements/balar/tests/testsuite_default_balar.py index daf8faf9d5..1524d04115 100644 --- a/src/sst/elements/balar/tests/testsuite_default_balar.py +++ b/src/sst/elements/balar/tests/testsuite_default_balar.py @@ -6,31 +6,12 @@ import os import shutil -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - # Put your single instance Init Code Here - class_inst._setupbalarTestFiles() - module_init = 1 - - module_sema.release() - -################################################################################ class testcase_balar(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) + self._setupbalarTestFiles() def tearDown(self): # Put test based teardown code here. it is called once after every test diff --git a/src/sst/elements/cacheTracer/tests/testsuite_default_cacheTracer.py b/src/sst/elements/cacheTracer/tests/testsuite_default_cacheTracer.py index c24e61f67c..29fdb89d64 100644 --- a/src/sst/elements/cacheTracer/tests/testsuite_default_cacheTracer.py +++ b/src/sst/elements/cacheTracer/tests/testsuite_default_cacheTracer.py @@ -3,33 +3,11 @@ from sst_unittest import * from sst_unittest_support import * -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - try: - # Put your single instance Init Code Here - pass - except: - pass - module_init = 1 - module_sema.release() - -################################################################################ class testcase_cacheTracer_Component(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) # Put test based setup code here. it is called once before every test def tearDown(self): diff --git a/src/sst/elements/cassini/tests/testsuite_default_cassini_prefetch.py b/src/sst/elements/cassini/tests/testsuite_default_cassini_prefetch.py index f568a5eb6e..5d1ba2f774 100644 --- a/src/sst/elements/cassini/tests/testsuite_default_cassini_prefetch.py +++ b/src/sst/elements/cassini/tests/testsuite_default_cassini_prefetch.py @@ -3,33 +3,11 @@ from sst_unittest import * from sst_unittest_support import * -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - try: - # Put your single instance Init Code Here - pass - except: - pass - module_init = 1 - module_sema.release() - -################################################################################ class testcase_cassini_prefetch(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) # Put test based setup code here. it is called once before every test def tearDown(self): diff --git a/src/sst/elements/cramSim/tests/testsuite_default_cramSim.py b/src/sst/elements/cramSim/tests/testsuite_default_cramSim.py index 797d8804c9..d646921c99 100644 --- a/src/sst/elements/cramSim/tests/testsuite_default_cramSim.py +++ b/src/sst/elements/cramSim/tests/testsuite_default_cramSim.py @@ -6,35 +6,12 @@ import os import shutil -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - try: - # Put your single instance Init Code Here - class_inst._setupcramSimTestFiles() - module_init = 1 - except: - pass - module_init = 1 - - module_sema.release() - -################################################################################ class testcase_cramSim_Component(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) + self._setupcramSimTestFiles() def tearDown(self): # Put test based teardown code here. it is called once after every test diff --git a/src/sst/elements/ember/tests/testsuite_default_ember_ESshmem.py b/src/sst/elements/ember/tests/testsuite_default_ember_ESshmem.py index 0d2905f4ab..16a0f79466 100644 --- a/src/sst/elements/ember/tests/testsuite_default_ember_ESshmem.py +++ b/src/sst/elements/ember/tests/testsuite_default_ember_ESshmem.py @@ -74,30 +74,12 @@ def gen_custom_name(testcase_func, param_num, param): parameterized.to_safe_name(str(param.args[1]))) return testcasename -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - try: - # Put your single instance Init Code Here - class_inst._setupESshmemTestFiles() - except: - pass - module_init = 1 - module_sema.release() - -################################################################################ class testcase_Ember_ESshmem(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) + self._setupESshmemTestFiles() def tearDown(self): # Put test based teardown code here. it is called once after every test diff --git a/src/sst/elements/ember/tests/testsuite_default_ember_nightly.py b/src/sst/elements/ember/tests/testsuite_default_ember_nightly.py index e141ec5956..3dfe32cb3c 100644 --- a/src/sst/elements/ember/tests/testsuite_default_ember_nightly.py +++ b/src/sst/elements/ember/tests/testsuite_default_ember_nightly.py @@ -5,34 +5,13 @@ import os -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - try: - # Put your single instance Init Code Here - class_inst._cleanupEmberTestFiles() - class_inst._setupEmberTestFiles() - except: - pass - module_init = 1 - module_sema.release() - -################################################################################ class testcase_EmberNightly(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) + self._cleanupEmberTestFiles() + self._setupEmberTestFiles() def tearDown(self): # Put test based teardown code here. it is called once after every test diff --git a/src/sst/elements/ember/tests/testsuite_default_ember_qos.py b/src/sst/elements/ember/tests/testsuite_default_ember_qos.py index 726588fe40..804a17f6a7 100644 --- a/src/sst/elements/ember/tests/testsuite_default_ember_qos.py +++ b/src/sst/elements/ember/tests/testsuite_default_ember_qos.py @@ -5,33 +5,12 @@ import os -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - try: - # Put your single instance Init Code Here - class_inst._setupQOSTestFiles() - except: - pass - module_init = 1 - module_sema.release() - -################################################################################ class testcase_QOS(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) + self._setupQOSTestFiles() def tearDown(self): # Put test based teardown code here. it is called once after every test diff --git a/src/sst/elements/ember/tests/testsuite_default_ember_sweep.py b/src/sst/elements/ember/tests/testsuite_default_ember_sweep.py index 2e6decf9e2..06ec440b6f 100644 --- a/src/sst/elements/ember/tests/testsuite_default_ember_sweep.py +++ b/src/sst/elements/ember/tests/testsuite_default_ember_sweep.py @@ -135,30 +135,12 @@ def gen_custom_name(testcase_func, param_num, param): parameterized.to_safe_name(str(param.args[1]))) return testcasename -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - try: - # Put your single instance Init Code Here - class_inst._setupEmberTestFiles() - except: - pass - module_init = 1 - module_sema.release() - -################################################################################ class testcase_EmberSweep(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) + self._setupEmberTestFiles() def tearDown(self): # Put test based teardown code here. it is called once after every test diff --git a/src/sst/elements/gensa/tests/testsuite_default_gensa.py b/src/sst/elements/gensa/tests/testsuite_default_gensa.py index 300eb0790b..d5ea460cf9 100644 --- a/src/sst/elements/gensa/tests/testsuite_default_gensa.py +++ b/src/sst/elements/gensa/tests/testsuite_default_gensa.py @@ -3,33 +3,11 @@ from sst_unittest import * from sst_unittest_support import * -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - try: - # Put your single instance Init Code Here - pass - except: - pass - module_init = 1 - module_sema.release() - -################################################################################ class testcase_gensa_Component(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) # Put test based setup code here. it is called once before every test def tearDown(self): diff --git a/src/sst/elements/kingsley/tests/testsuite_default_kingsley.py b/src/sst/elements/kingsley/tests/testsuite_default_kingsley.py index 61329fafcc..7de3d220d0 100644 --- a/src/sst/elements/kingsley/tests/testsuite_default_kingsley.py +++ b/src/sst/elements/kingsley/tests/testsuite_default_kingsley.py @@ -3,33 +3,11 @@ from sst_unittest import * from sst_unittest_support import * -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - try: - # Put your single instance Init Code Here - pass - except: - pass - module_init = 1 - module_sema.release() - -################################################################################ class testcase_kingsley_Component(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) # Put test based setup code here. it is called once before every test def tearDown(self): diff --git a/src/sst/elements/llyr/tests/testsuite_default_llyr.py b/src/sst/elements/llyr/tests/testsuite_default_llyr.py index df734a5243..871960bedc 100644 --- a/src/sst/elements/llyr/tests/testsuite_default_llyr.py +++ b/src/sst/elements/llyr/tests/testsuite_default_llyr.py @@ -3,33 +3,11 @@ from sst_unittest import * from sst_unittest_support import * -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - try: - # Put your single instance Init Code Here - pass - except: - pass - module_init = 1 - module_sema.release() - -################################################################################ class testcase_llyr_Component(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) # Put test based setup code here. it is called once before every test def tearDown(self): diff --git a/src/sst/elements/memHierarchy/tests/testsuite_default_memHierarchy_hybridsim.py b/src/sst/elements/memHierarchy/tests/testsuite_default_memHierarchy_hybridsim.py index fa208b191a..e96370ec55 100644 --- a/src/sst/elements/memHierarchy/tests/testsuite_default_memHierarchy_hybridsim.py +++ b/src/sst/elements/memHierarchy/tests/testsuite_default_memHierarchy_hybridsim.py @@ -4,35 +4,11 @@ from sst_unittest_support import * import os -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - try: - # Put your single instance Init Code Here - pass - except: - pass - module_init = 1 - module_sema.release() - -################################################################################ -################################################################################ -################################################################################ class testcase_memHierarchy_hybridsim(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) # Put test based setup code here. it is called once before every test def tearDown(self): diff --git a/src/sst/elements/memHierarchy/tests/testsuite_default_memHierarchy_memHA.py b/src/sst/elements/memHierarchy/tests/testsuite_default_memHierarchy_memHA.py index ea21916c0b..ffe0b33772 100644 --- a/src/sst/elements/memHierarchy/tests/testsuite_default_memHierarchy_memHA.py +++ b/src/sst/elements/memHierarchy/tests/testsuite_default_memHierarchy_memHA.py @@ -5,27 +5,7 @@ import os.path import re -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - module_sema.acquire() - if module_init != 1: - try: - # Put your single instance Init Code Here - pass - except: - pass - module_init = 1 - module_sema.release() - -################################################################################ ################################################################################ ################################################################################ @@ -33,7 +13,6 @@ class testcase_memHierarchy_memHA(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) # Put test based setup code here. it is called once before every test def tearDown(self): diff --git a/src/sst/elements/memHierarchy/tests/testsuite_default_memHierarchy_memHSieve.py b/src/sst/elements/memHierarchy/tests/testsuite_default_memHierarchy_memHSieve.py index 9039005a37..a43bb55345 100644 --- a/src/sst/elements/memHierarchy/tests/testsuite_default_memHierarchy_memHSieve.py +++ b/src/sst/elements/memHierarchy/tests/testsuite_default_memHierarchy_memHSieve.py @@ -7,36 +7,13 @@ import fnmatch import csv -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - try: - # Put your single instance Init Code Here - class_inst._setup_sieve_test_files() - except: - pass - module_init = 1 - module_sema.release() - -################################################################################ -################################################################################ -################################################################################ class testcase_memHierarchy_memHSieve(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) # Put test based setup code here. it is called once before every test + self._setup_sieve_test_files() def tearDown(self): # Put test based teardown code here. it is called once after every test diff --git a/src/sst/elements/memHierarchy/tests/testsuite_default_memHierarchy_sdl.py b/src/sst/elements/memHierarchy/tests/testsuite_default_memHierarchy_sdl.py index 6494e39a54..cb4e7290bb 100644 --- a/src/sst/elements/memHierarchy/tests/testsuite_default_memHierarchy_sdl.py +++ b/src/sst/elements/memHierarchy/tests/testsuite_default_memHierarchy_sdl.py @@ -4,35 +4,11 @@ from sst_unittest_support import * import os.path -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - try: - # Put your single instance Init Code Here - pass - except: - pass - module_init = 1 - module_sema.release() - -################################################################################ -################################################################################ -################################################################################ class testcase_memHierarchy_sdl(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) # Put test based setup code here. it is called once before every test def tearDown(self): diff --git a/src/sst/elements/memHierarchy/tests/testsuite_openMP_memHierarchy_dirnoncacheable.py b/src/sst/elements/memHierarchy/tests/testsuite_openMP_memHierarchy_dirnoncacheable.py index 70004d4c25..d227393019 100644 --- a/src/sst/elements/memHierarchy/tests/testsuite_openMP_memHierarchy_dirnoncacheable.py +++ b/src/sst/elements/memHierarchy/tests/testsuite_openMP_memHierarchy_dirnoncacheable.py @@ -3,33 +3,11 @@ from sst_unittest import * from sst_unittest_support import * -module_init = 0 -module_sema = threading.Semaphore() - -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - try: - # Put your single instance Init Code Here - pass - except: - pass - module_init = 1 - module_sema.release() - -################################################################################ class testcase_memH_openMP_dirnoncacheable(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) def tearDown(self): # Put test based teardown code here. it is called once after every test diff --git a/src/sst/elements/memHierarchy/tests/testsuite_openMP_memHierarchy_diropenMP.py b/src/sst/elements/memHierarchy/tests/testsuite_openMP_memHierarchy_diropenMP.py index e54b4aec3e..0f57e99772 100644 --- a/src/sst/elements/memHierarchy/tests/testsuite_openMP_memHierarchy_diropenMP.py +++ b/src/sst/elements/memHierarchy/tests/testsuite_openMP_memHierarchy_diropenMP.py @@ -3,33 +3,11 @@ from sst_unittest import * from sst_unittest_support import * -module_init = 0 -module_sema = threading.Semaphore() - -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - try: - # Put your single instance Init Code Here - pass - except: - pass - module_init = 1 - module_sema.release() - -################################################################################ class testcase_memH_openMP_diropenMP(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) def tearDown(self): # Put test based teardown code here. it is called once after every test diff --git a/src/sst/elements/memHierarchy/tests/testsuite_openMP_memHierarchy_noncacheable.py b/src/sst/elements/memHierarchy/tests/testsuite_openMP_memHierarchy_noncacheable.py index bf780730ea..1bc3564276 100644 --- a/src/sst/elements/memHierarchy/tests/testsuite_openMP_memHierarchy_noncacheable.py +++ b/src/sst/elements/memHierarchy/tests/testsuite_openMP_memHierarchy_noncacheable.py @@ -6,30 +6,11 @@ module_init = 0 module_sema = threading.Semaphore() -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - try: - # Put your single instance Init Code Here - pass - except: - pass - module_init = 1 - module_sema.release() - -################################################################################ class testcase_memH_openMP_noncacheable(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) def tearDown(self): # Put test based teardown code here. it is called once after every test diff --git a/src/sst/elements/memHierarchy/tests/testsuite_openMP_memHierarchy_openMP.py b/src/sst/elements/memHierarchy/tests/testsuite_openMP_memHierarchy_openMP.py index f904312c87..f717830ec8 100644 --- a/src/sst/elements/memHierarchy/tests/testsuite_openMP_memHierarchy_openMP.py +++ b/src/sst/elements/memHierarchy/tests/testsuite_openMP_memHierarchy_openMP.py @@ -3,33 +3,11 @@ from sst_unittest import * from sst_unittest_support import * -module_init = 0 -module_sema = threading.Semaphore() - -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - try: - # Put your single instance Init Code Here - pass - except: - pass - module_init = 1 - module_sema.release() - -################################################################################ class testcase_memH_openMP_openMP(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) def tearDown(self): # Put test based teardown code here. it is called once after every test diff --git a/src/sst/elements/memHierarchy/tests/testsuite_sweep_memHierarchy_dir3LevelSweep.py b/src/sst/elements/memHierarchy/tests/testsuite_sweep_memHierarchy_dir3LevelSweep.py index 243e44766f..44e00e6609 100644 --- a/src/sst/elements/memHierarchy/tests/testsuite_sweep_memHierarchy_dir3LevelSweep.py +++ b/src/sst/elements/memHierarchy/tests/testsuite_sweep_memHierarchy_dir3LevelSweep.py @@ -145,30 +145,11 @@ def gen_custom_name(testcase_func, param_num, param): ) return testcasename -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - try: - # Put your single instance Init Code Here - pass - except: - pass - module_init = 1 - module_sema.release() - -################################################################################ class testcase_memH_sweep_dir3levelsweep(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) def tearDown(self): # Put test based teardown code here. it is called once after every test diff --git a/src/sst/elements/memHierarchy/tests/testsuite_sweep_memHierarchy_dirSweep.py b/src/sst/elements/memHierarchy/tests/testsuite_sweep_memHierarchy_dirSweep.py index c4176fe04f..3d1196516f 100644 --- a/src/sst/elements/memHierarchy/tests/testsuite_sweep_memHierarchy_dirSweep.py +++ b/src/sst/elements/memHierarchy/tests/testsuite_sweep_memHierarchy_dirSweep.py @@ -120,30 +120,11 @@ def gen_custom_name(testcase_func, param_num, param): parameterized.to_safe_name(str(param.args[9]))) # prefetch return testcasename -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - try: - # Put your single instance Init Code Here - pass - except: - pass - module_init = 1 - module_sema.release() - -################################################################################ class testcase_memH_sweep_dirsweep(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) def tearDown(self): # Put test based teardown code here. it is called once after every test diff --git a/src/sst/elements/memHierarchy/tests/testsuite_sweep_memHierarchy_dirSweepB.py b/src/sst/elements/memHierarchy/tests/testsuite_sweep_memHierarchy_dirSweepB.py index 00838a05aa..8f62630934 100644 --- a/src/sst/elements/memHierarchy/tests/testsuite_sweep_memHierarchy_dirSweepB.py +++ b/src/sst/elements/memHierarchy/tests/testsuite_sweep_memHierarchy_dirSweepB.py @@ -10,8 +10,6 @@ dirpath = os.path.dirname(sys.modules[__name__].__file__) -module_init = 0 -module_sema = threading.Semaphore() sweep_test_matrix = [] ################################################################################ @@ -122,30 +120,11 @@ def gen_custom_name(testcase_func, param_num, param): parameterized.to_safe_name(str(param.args[9]))) # prefetch return testcasename -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - try: - # Put your single instance Init Code Here - pass - except: - pass - module_init = 1 - module_sema.release() - -################################################################################ class testcase_memH_sweep_dirsweepB(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) def tearDown(self): # Put test based teardown code here. it is called once after every test diff --git a/src/sst/elements/memHierarchy/tests/testsuite_sweep_memHierarchy_dirSweepI.py b/src/sst/elements/memHierarchy/tests/testsuite_sweep_memHierarchy_dirSweepI.py index 9fb02b7a4a..f31a449478 100644 --- a/src/sst/elements/memHierarchy/tests/testsuite_sweep_memHierarchy_dirSweepI.py +++ b/src/sst/elements/memHierarchy/tests/testsuite_sweep_memHierarchy_dirSweepI.py @@ -122,30 +122,11 @@ def gen_custom_name(testcase_func, param_num, param): parameterized.to_safe_name(str(param.args[9]))) # prefetch return testcasename -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - try: - # Put your single instance Init Code Here - pass - except: - pass - module_init = 1 - module_sema.release() - -################################################################################ class testcase_memH_sweep_dirsweepI(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) def tearDown(self): # Put test based teardown code here. it is called once after every test diff --git a/src/sst/elements/memHierarchy/tests/testsuite_sweep_memHierarchy_openMP.py b/src/sst/elements/memHierarchy/tests/testsuite_sweep_memHierarchy_openMP.py index 14f3daef77..fd28d622bd 100644 --- a/src/sst/elements/memHierarchy/tests/testsuite_sweep_memHierarchy_openMP.py +++ b/src/sst/elements/memHierarchy/tests/testsuite_sweep_memHierarchy_openMP.py @@ -120,30 +120,11 @@ def gen_custom_name(testcase_func, param_num, param): parameterized.to_safe_name(str(param.args[9]))) # prefetch return testcasename -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - try: - # Put your single instance Init Code Here - pass - except: - pass - module_init = 1 - module_sema.release() - -################################################################################ class testcase_memH_sweep_openMP(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) def tearDown(self): # Put test based teardown code here. it is called once after every test diff --git a/src/sst/elements/merlin/tests/testsuite_default_merlin.py b/src/sst/elements/merlin/tests/testsuite_default_merlin.py index dca89d7e3f..1e94b14b6a 100644 --- a/src/sst/elements/merlin/tests/testsuite_default_merlin.py +++ b/src/sst/elements/merlin/tests/testsuite_default_merlin.py @@ -12,33 +12,11 @@ except: pass -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - try: - # Put your single instance Init Code Here - pass - except: - pass - module_init = 1 - module_sema.release() - -################################################################################ class testcase_merlin_Component(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) # Put test based setup code here. it is called once before every test def tearDown(self): diff --git a/src/sst/elements/messier/tests/testsuite_default_Messier.py b/src/sst/elements/messier/tests/testsuite_default_Messier.py index 8759e02105..9427575700 100644 --- a/src/sst/elements/messier/tests/testsuite_default_Messier.py +++ b/src/sst/elements/messier/tests/testsuite_default_Messier.py @@ -3,33 +3,11 @@ from sst_unittest import * from sst_unittest_support import * -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - try: - # Put your single instance Init Code Here - pass - except: - pass - module_init = 1 - module_sema.release() - -################################################################################ class testcase_Messier_Component(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) # Put test based setup code here. it is called once before every test def tearDown(self): diff --git a/src/sst/elements/miranda/tests/testsuite_default_miranda.py b/src/sst/elements/miranda/tests/testsuite_default_miranda.py index 1b3f40f324..7b076cae4d 100644 --- a/src/sst/elements/miranda/tests/testsuite_default_miranda.py +++ b/src/sst/elements/miranda/tests/testsuite_default_miranda.py @@ -3,33 +3,11 @@ from sst_unittest import * from sst_unittest_support import * -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - try: - # Put your single instance Init Code Here - pass - except: - pass - module_init = 1 - module_sema.release() - -################################################################################ class testcase_miranda_Component(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) # Put test based setup code here. it is called once before every test def tearDown(self): diff --git a/src/sst/elements/prospero/tests/testsuite_default_prospero.py b/src/sst/elements/prospero/tests/testsuite_default_prospero.py index 585b053a88..b13f6462dd 100644 --- a/src/sst/elements/prospero/tests/testsuite_default_prospero.py +++ b/src/sst/elements/prospero/tests/testsuite_default_prospero.py @@ -10,38 +10,15 @@ WITH_TIMINGDRAM = True NO_TIMINGDRAM = False -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - try: - # Put your single instance Init Code Here - class_inst._setup_prospero_test_dirs() - class_inst._create_prospero_PIN_trace_files() - class_inst._download_prospero_TAR_trace_files() - except: - pass - module_init = 1 - module_sema.release() - -################################################################################ -################################################################################ -################################################################################ class testcase_prospero(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) # Put test based setup code here. it is called once before every test + self._setup_prospero_test_dirs() + self._create_prospero_PIN_trace_files() + self._download_prospero_TAR_trace_files() def tearDown(self): # Put test based teardown code here. it is called once after every test diff --git a/src/sst/elements/rdmaNic/tests/testsuite_default_rdmaNic.py b/src/sst/elements/rdmaNic/tests/testsuite_default_rdmaNic.py index 1098308a5b..ed2b82a092 100644 --- a/src/sst/elements/rdmaNic/tests/testsuite_default_rdmaNic.py +++ b/src/sst/elements/rdmaNic/tests/testsuite_default_rdmaNic.py @@ -63,31 +63,13 @@ def gen_custom_name(testcase_func, param_num, param): parameterized.to_safe_name(str(param.args[1]))) return testcasename -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - try: - # Put your single instance Init Code Here - class_inst._setupRdmaNicTestFiles() - except: - pass - module_init = 1 - module_sema.release() - -################################################################################ class testcase_rdmaNic(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) # Put test based setup code here. it is called once before every test + self._setupRdmaNicTestFiles() def tearDown(self): # Put test based teardown code here. it is called once after every test diff --git a/src/sst/elements/samba/tests/testsuite_default_Samba.py b/src/sst/elements/samba/tests/testsuite_default_Samba.py index b67802bacc..6f688dfe57 100644 --- a/src/sst/elements/samba/tests/testsuite_default_Samba.py +++ b/src/sst/elements/samba/tests/testsuite_default_Samba.py @@ -3,33 +3,11 @@ from sst_unittest import * from sst_unittest_support import * -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - try: - # Put your single instance Init Code Here - pass - except: - pass - module_init = 1 - module_sema.release() - -################################################################################ class testcase_Samba_Component(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) # Put test based setup code here. it is called once before every test def tearDown(self): diff --git a/src/sst/elements/shogun/tests/testsuite_default_shogun.py b/src/sst/elements/shogun/tests/testsuite_default_shogun.py index 8d9aed57a6..e3ae67d774 100644 --- a/src/sst/elements/shogun/tests/testsuite_default_shogun.py +++ b/src/sst/elements/shogun/tests/testsuite_default_shogun.py @@ -3,33 +3,11 @@ from sst_unittest import * from sst_unittest_support import * -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - try: - # Put your single instance Init Code Here - pass - except: - pass - module_init = 1 - module_sema.release() - -################################################################################ class testcase_shogun(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) # Put test based setup code here. it is called once before every test def tearDown(self): diff --git a/src/sst/elements/vanadis/tests/basic_vanadis.py b/src/sst/elements/vanadis/tests/basic_vanadis.py index 492fe1ecca..7a3615992e 100644 --- a/src/sst/elements/vanadis/tests/basic_vanadis.py +++ b/src/sst/elements/vanadis/tests/basic_vanadis.py @@ -145,7 +145,6 @@ "checkpoint" : checkpoint } - processList = ( ( 1, { "env_count" : 1, @@ -153,10 +152,6 @@ "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) diff --git a/src/sst/elements/vanadis/tests/boom_vanadis-kingsley.py b/src/sst/elements/vanadis/tests/boom_vanadis-kingsley.py index 1b0d65d884..13a9cb9641 100644 --- a/src/sst/elements/vanadis/tests/boom_vanadis-kingsley.py +++ b/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,9 +35,9 @@ #exe = "test-branch" #exe = "test-shift" -testDir = "misc" +#testDir = "misc" #exe = "mt-dgemm" -exe = "stream" +#exe = "stream" #exe = "stream-fortran" #exe = "gettime" #exe = "splitLoad" @@ -43,7 +45,10 @@ #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", diff --git a/src/sst/elements/vanadis/tests/testsuite_default_vanadis.py b/src/sst/elements/vanadis/tests/testsuite_default_vanadis.py index 3f26b430a3..eb3940315d 100644 --- a/src/sst/elements/vanadis/tests/testsuite_default_vanadis.py +++ b/src/sst/elements/vanadis/tests/testsuite_default_vanadis.py @@ -124,31 +124,13 @@ def gen_custom_name(testcase_func, param_num, param): parameterized.to_safe_name(str(param.args[1]))) return testcasename -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - try: - # Put your single instance Init Code Here - class_inst._setupTests() - except: - pass - module_init = 1 - module_sema.release() - -################################################################################ class testcase_vanadis(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) # Put test based setup code here. it is called once before every test + self._setupTests() def tearDown(self): # Put test based teardown code here. it is called once after every test diff --git a/src/sst/elements/vaultsim/tests/testsuite_default_VaultSim.py b/src/sst/elements/vaultsim/tests/testsuite_default_VaultSim.py index 6b39424d70..8dff10fe08 100644 --- a/src/sst/elements/vaultsim/tests/testsuite_default_VaultSim.py +++ b/src/sst/elements/vaultsim/tests/testsuite_default_VaultSim.py @@ -3,33 +3,11 @@ from sst_unittest import * from sst_unittest_support import * -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - try: - # Put your single instance Init Code Here - pass - except: - pass - module_init = 1 - module_sema.release() - -################################################################################ class testcase_VaultSim(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) # Put test based setup code here. it is called once before every test def tearDown(self): diff --git a/src/sst/elements/zodiac/test/testsuite_default_SiriusZodiacTrace.py b/src/sst/elements/zodiac/test/testsuite_default_SiriusZodiacTrace.py index 7b5c5f5b1b..01a2050807 100644 --- a/src/sst/elements/zodiac/test/testsuite_default_SiriusZodiacTrace.py +++ b/src/sst/elements/zodiac/test/testsuite_default_SiriusZodiacTrace.py @@ -6,35 +6,12 @@ #import os #import shutil -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - try: - # Put your single instance Init Code Here - class_inst._setupSiriusZodiacTraceTestFiles() - module_init = 1 - except: - pass - module_init = 1 - - module_sema.release() - -################################################################################ class testcase_SiriusZodiacTrace(SSTTestCase): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) + self._setupSiriusZodiacTraceTestFiles() def tearDown(self): # Put test based teardown code here. it is called once after every test