Browse Source

Fixed some travis stuff and duda

msmith-techempower 10 years ago
parent
commit
aa3f0304ee

+ 1 - 3
frameworks/C/duda/bash_profile.sh

@@ -1,5 +1,3 @@
 #!/bin/bash
 
-export DUDAPATH=${IROOT}/dudac-0.23
-
-export PATH="$DUDAPATH:$PATH"
+export DUDA_HOME=${IROOT}/dudac-0.23

+ 2 - 2
frameworks/C/duda/install.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-RETCODE=$(fw_exists duda-0.23.installed)
+RETCODE=$(fw_exists ${IROOT}/duda-0.23.installed)
 [ ! "$RETCODE" == 0 ] || { return 0; }
 
 fw_get http://duda.io/releases/duda-client/dudac-0.23.tar.gz -O dudac-0.23.tar.gz
@@ -12,4 +12,4 @@ cd dudac-0.23
 ./dudac -s
 
 cd ..
-touch duda-0.23.installed
+touch ${IROOT}/duda-0.23.installed

+ 2 - 0
frameworks/C/duda/setup.sh

@@ -1,3 +1,5 @@
 #!/bin/bash
 
+export PATH=${DUDA_HOME}:$PATH
+
 dudac -w $TROOT/webservice -p 2001 &

+ 2 - 2
toolset/benchmark/framework_test.py

@@ -169,8 +169,8 @@ class FrameworkTest:
 
     # Setup variables for TROOT and IROOT
     setup_util.replace_environ(config=profile, 
-              command='export TROOT=%s && export IROOT=%s && export DBHOST=%s && export MAX_THREADS=%s' %
-              (self.directory, self.install_root, self.database_host, self.benchmarker.threads))
+              command='export TROOT=%s && export IROOT=%s && export DBHOST=%s && export MAX_THREADS=%s && export OUT=%s && export ERR=%s' %
+              (self.directory, self.install_root, self.database_host, self.benchmarker.threads, os.path.join(self.fwroot, out.name), os.path.join(self.fwroot, err.name)))
 
     # Because start can take so long, we print a dot to let the user know 
     # we are working

+ 4 - 0
toolset/run-ci.py

@@ -385,6 +385,10 @@ class CIRunnner:
     sudo chown testrunner:testrunner /home/testrunner
     # Add the testrunner user to every group that the travis user is in
     sudo sed -i 's|:travis|:travis,testrunner|g' /etc/group
+    # Add the testrunner user to the travis group specifically
+    sudo sed -i 's|travis:x:\(.*\):|travis:x:\1:testrunner|g' /etc/group
+    # Maybe unneeded - add the travis user to the testrunner group
+    sudo sed -i 's|testrunner:x:\(.*\):|testrunner:x:\1:travis|g' /etc/group
     # Set the default shell for testrunner to /bin/bash
     sudo sed -i 's|/home/testrunner:/bin/sh|/home/testrunner:/bin/bash|g' /etc/passwd