[Darshan-commits] [Git][darshan/darshan][master] more automated build refactoring

[Shane Snyder]

Shane Snyder pushed to branch master at darshan / darshan


Commits:
2ffc3584 by Shane Snyder at 2018-04-10T17:38:24-05:00
more automated build refactoring

- - - - -


2 changed files:

- darshan-test/automated/common/build.sh
- − darshan-test/automated/mcs/build.sh


Changes:

=====================================
darshan-test/automated/common/build.sh
=====================================
--- a/darshan-test/automated/common/build.sh
+++ b/darshan-test/automated/common/build.sh
@@ -1,17 +1,43 @@
 #!/bin/bash
 #
-# Base build script which calls the system specific version.
+# Build darshan runtime and util code
 #
+fcount=0
+runtime_status=0
+util_status=0
+runtime_result=""
+util_result=""
+thedate=$(date)
 
-status=0
+cd build/darshan-runtime
+make && make install
+runtime_status=$?
+if [ $runtime_status -ne 0 ]; then
+  fcount=$((fcount+1));
+  runtime_result="<error type='$runtime_status' message='build failed' />"
+fi
 
-if [[ $NODE_LABELS =~ "mcs" ]];
-then
-  source darshan-test/automated/mcs/build.sh
-  status=$?
-else
-  # unknown machine
-  status=100
+cd ../../build/darshan-util
+make && make install
+util_status=$?
+if [ $util_status -ne 0 ]; then
+  fcount=$((fcount+1));
+  util_result="<error type='$util_status' message='build failed' />"
 fi
 
-exit $status
+cd ../../;
+
+echo "
+<testsuites>
+  <testsuite name='build' tests='2' failures='$fcount' time='$thedate'>
+    <testcase name='darshan-runtime' time='$thedate'>
+    $runtime_result
+    </testcase>
+    <testcase name='darshan-util' time='$thedate'>
+    $util_result
+    </testcase>
+  </testsuite>
+</testsuites>
+" > build-result.xml
+
+exit $fcount


=====================================
darshan-test/automated/mcs/build.sh deleted
=====================================
--- a/darshan-test/automated/mcs/build.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-#
-# Build darshan runtime and util code
-#
-fcount=0
-runtime_status=0
-util_status=0
-runtime_result=""
-util_result=""
-thedate=$(date)
-
-cd build/darshan-runtime
-make && make install
-runtime_status=$?
-if [ $runtime_status -ne 0 ]; then
-  fcount=$((fcount+1));
-  runtime_result="<error type='$runtime_status' message='build failed' />"
-fi
-
-cd ../../build/darshan-util
-make && make install
-util_status=$?
-if [ $util_status -ne 0 ]; then
-  fcount=$((fcount+1));
-  util_result="<error type='$util_status' message='build failed' />"
-fi
-
-cd ../../;
-
-echo "
-<testsuites>
-  <testsuite name='build' tests='2' failures='$fcount' time='$thedate'>
-    <testcase name='darshan-runtime' time='$thedate'>
-    $runtime_result
-    </testcase>
-    <testcase name='darshan-util' time='$thedate'>
-    $util_result
-    </testcase>
-  </testsuite>
-</testsuites>
-" > build-result.xml
-
-exit $fcount



View it on GitLab: https://xgitlab.cels.anl.gov/darshan/darshan/commit/2ffc358418f23149c3259f9506bc53b1d1dbd2b8

---
View it on GitLab: https://xgitlab.cels.anl.gov/darshan/darshan/commit/2ffc358418f23149c3259f9506bc53b1d1dbd2b8
You're receiving this email because of your account on xgitlab.cels.anl.gov.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/darshan-commits/attachments/20180410/6e1cb169/attachment-0001.html>