Add Zoltan and Ariel build and test to sstmainline_config

LeiHuang-LM · Jun 9, 2014 · 6a17ce2 · 6a17ce2
1 parent 823c666
commit 6a17ce2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -14,7 +14,13 @@ EXTRA_DIST = \
 	PLATFORMS \
 	README \
 	VERSION \
-	deps/patches/qsim-0.2.1-fileOpenCheck.patch
+	deps/patches/qsim-0.2.1-fileOpenCheck.patch \
+	tools/ariel/fesimple/fesimple.cc \
+	tools/ariel/fesimple/Makefile \
+	tools/ariel/fesimple/examples/multicore.py \
+	tools/ariel/fesimple/examples/stream/Makefile \
+	tools/ariel/fesimple/examples/stream/runstream.py \
+	tools/ariel/fesimple/examples/stream/stream.c
 
 SUBDIRS = \
 	sst \

diff --git a/bamboo.sh b/bamboo.sh
@@ -173,6 +173,8 @@ dotests() {
     fi
 
 
+    ${SST_TEST_SUITES}/testSuite_Ariel.sh
+    ${SST_TEST_SUITES}/testSuite_zoltan.sh
     ${SST_TEST_SUITES}/testSuite_SiriusZodiacTrace.sh
     ${SST_TEST_SUITES}/testSuite_memHierarchy_sdl.sh
     ${SST_TEST_SUITES}/testSuite_sst_mcopteron.sh
@@ -353,9 +355,9 @@ getconfig() {
             #-----------------------------------------------------------------
             export | egrep SST_DEPS_
             miscEnv="${mpi_environment}"
-            depsStr="-k none -d 2.2.2 -p none -z none -b 1.50 -g stabledevel -m none -i none -o none -h none -s none -q 0.2.1 -M none -N default"
+            depsStr="-k none -d 2.2.2 -p none -z none -b 1.50 -g stabledevel -m none -i none -o none -h none -s none -q 0.2.1 -M none -N default -a 2.13-61206 -z 3.8"
             setConvenienceVars "$depsStr"
-            configStr="$baseoptions --with-gem5=$SST_DEPS_INSTALL_GEM5SST --with-gem5-build=opt --with-dramsim=$SST_DEPS_INSTALL_DRAMSIM --with-hybridsim=$SST_DEPS_INSTALL_HYBRIDSIM --with-qsim=$SST_DEPS_INSTALL_QSIM --with-glpk=${GLPK_HOME} $miscEnv"
+            configStr="$baseoptions --with-gem5=$SST_DEPS_INSTALL_GEM5SST --with-gem5-build=opt --with-dramsim=$SST_DEPS_INSTALL_DRAMSIM --with-hybridsim=$SST_DEPS_INSTALL_HYBRIDSIM --with-qsim=$SST_DEPS_INSTALL_QSIM --with-glpk=${GLPK_HOME} --with-pin=$SST_DEPS_INSTALL_INTEL_PIN --with-zoltan=$SST_DEPS_INSTALL_ZOLTAN $miscEnv"
             ;;
         sstmainline_configA) 
             #-----------------------------------------------------------------
@@ -774,6 +776,7 @@ dobuild() {
 
     echo "==================== Building SST ===================="
     export LD_LIBRARY_PATH=${SST_INSTALL_DEPS}/lib:${SST_INSTALL_DEPS}/lib/sst:${SST_DEPS_INSTALL_GEM5SST}:${SST_INSTALL_DEPS}/packages/DRAMSim:${SST_DEPS_INSTALL_NVDIMMSIM}:${SST_DEPS_INSTALL_HYBRIDSIM}:${SST_INSTALL_DEPS}/packages/Qsim/lib:${LD_LIBRARY_PATH}
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$BOOST_LIBS
     # Mac OS X needs some help finding dylibs
     if [ $kernel == "Darwin" ]
     then