Merge pull request #2640 from sstsimulator/devel

Automatically Merged using SST Master Branch Merger

Author: sst-autotester

configure.ac

@@ -5,7 +5,7 @@
 # Set Version of SST Elements Library
 AC_INIT([SST Elements Library],[-dev],[sst@sandia.gov])
 
-AC_PREREQ([2.59])
+AC_PREREQ([2.69])
 AC_COPYRIGHT([Copyright National Technology and Engineering Solutions of Sandia (NTESS), 2004-2025])
 
 AC_CONFIG_AUX_DIR([config])
@@ -30,7 +30,7 @@ AM_PROG_AS
 
 AC_PROG_CC
 AM_PROG_CC_C_O
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), 2.71,, m4_defn([AC_AUTOCONF_VERSION]), 2.70,, [AC_PROG_CC_C99])
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), 2.69, [AC_PROG_CC_C99], )
 AC_C_INLINE
 AC_PROG_MAKE_SET
 

src/sst/elements/mask-mpi/tests/testsuite_default_mask_mpi.py

@@ -21,53 +21,18 @@ def tearDown(self):
 #####
 
     def test_sendrecv(self):
-        testdir = self.get_testsuite_dir()
-        libdir = sstsimulator_conf_get_value("SST_ELEMENT_LIBRARY","SST_ELEMENT_LIBRARY_LIBDIR",str)
-        path = os.environ.get("SST_LIB_PATH")
-        if path is None or path == "":
-            os.environ["SST_LIB_PATH"] = libdir + "/ext"
-        else:
-            os.environ["SST_LIB_PATH"] = path + ":" + libdir + "/ext"
         self.mask_mpi_template("test_sendrecv")
 
     def test_reduce(self):
-        testdir = self.get_testsuite_dir()
-        libdir = sstsimulator_conf_get_value("SST_ELEMENT_LIBRARY","SST_ELEMENT_LIBRARY_LIBDIR",str)
-        path = os.environ.get("SST_LIB_PATH")
-        if path is None or path == "":
-            os.environ["SST_LIB_PATH"] = libdir + "/ext"
-        else:
-            os.environ["SST_LIB_PATH"] = path + ":" + libdir + "/ext"
         self.mask_mpi_template("test_reduce")
 
     def test_alltoall(self):
-        testdir = self.get_testsuite_dir()
-        libdir = sstsimulator_conf_get_value("SST_ELEMENT_LIBRARY","SST_ELEMENT_LIBRARY_LIBDIR",str)
-        path = os.environ.get("SST_LIB_PATH")
-        if path is None or path == "":
-            os.environ["SST_LIB_PATH"] = libdir + "/ext"
-        else:
-            os.environ["SST_LIB_PATH"] = path + ":" + libdir + "/ext"
         self.mask_mpi_template("test_alltoall")
 
     def test_allgather(self):
-        testdir = self.get_testsuite_dir()
-        libdir = sstsimulator_conf_get_value("SST_ELEMENT_LIBRARY","SST_ELEMENT_LIBRARY_LIBDIR",str)
-        path = os.environ.get("SST_LIB_PATH")
-        if path is None or path == "":
-            os.environ["SST_LIB_PATH"] = libdir + "/ext"
-        else:
-            os.environ["SST_LIB_PATH"] = path + ":" + libdir + "/ext"
         self.mask_mpi_template("test_allgather")
 
     def test_halo3d26(self):
-        testdir = self.get_testsuite_dir()
-        libdir = sstsimulator_conf_get_value("SST_ELEMENT_LIBRARY","SST_ELEMENT_LIBRARY_LIBDIR",str)
-        path = os.environ.get("SST_LIB_PATH")
-        if path is None or path == "":
-            os.environ["SST_LIB_PATH"] = libdir + "/ext"
-        else:
-            os.environ["SST_LIB_PATH"] = path + ":" + libdir + "/ext"
         self.mask_mpi_template("test_halo3d26")
 
 #####

src/sst/elements/mercury/tests/testsuite_default_hg.py

@@ -20,25 +20,9 @@ def tearDown(self):
 #####
 
     def test_os(self):
-        testdir = self.get_testsuite_dir()
-        libdir = sstsimulator_conf_get_value("SST_ELEMENT_LIBRARY","SST_ELEMENT_LIBRARY_LIBDIR", str)
-        path = os.environ.get("SST_LIB_PATH")
-        if path is None or path == "":
-            os.environ["SST_LIB_PATH"] = libdir + "/ext"
-        else:
-            os.environ["SST_LIB_PATH"] = path + ":" + libdir + "/ext"
-        print(os.environ["SST_LIB_PATH"])
         self.simple_components_template("ostest")
 
     def test_os_nano(self):
-        testdir = self.get_testsuite_dir()
-        libdir = sstsimulator_conf_get_value("SST_ELEMENT_LIBRARY","SST_ELEMENT_LIBRARY_LIBDIR", str)
-        path = os.environ.get("SST_LIB_PATH")
-        if path is None or path == "":
-            os.environ["SST_LIB_PATH"] = libdir + "/ext"
-        else:
-            os.environ["SST_LIB_PATH"] = path + ":" + libdir + "/ext"
-        print(os.environ["SST_LIB_PATH"])
         self.simple_components_template("ostest-nano")
 
 #####