~ salmonella-environment-setup (master) cbaea8f4ffbaa3f9d340dd37a0c0b1ac9cb03d66

commit cbaea8f4ffbaa3f9d340dd37a0c0b1ac9cb03d66
Author:     Mario Domenech Goulart <mario@parenteses.org>
AuthorDate: Sun Nov 22 15:01:33 2020 +0100
Commit:     Mario Domenech Goulart <mario@parenteses.org>
CommitDate: Sun Nov 22 15:01:36 2020 +0100

    run-salmonella.sh: add support for running C5 tools
    
    Add the CHICKEN_TESTS_MAJOR_VERSION variable to specify which major
    CHICKEN version is going to be used to run the test tools.  Default is
    for the time being 4.

diff --git a/run-salmonella.sh b/run-salmonella.sh
index 5c15079..006e9b9 100755
--- a/run-salmonella.sh
+++ b/run-salmonella.sh
@@ -23,14 +23,26 @@ in that order.
 EOF
 }
 
+# The CHICKEN major version to be considered when calling tools to run
+# tests (salmonella-run-publish, salmonella-html-report etc)
+CHICKEN_TESTS_MAJOR_VERSION=${CHICKEN_TESTS_MAJOR_VERSION:-4}
+
 # Conf files use these environment variables
 export CHICKEN_4_PREFIX=$HOME/local/chicken-4
 export CHICKEN_5_PREFIX=$HOME/local/chicken-5
 export CHICKEN_5_EGGS_DIR=$HOME/src/chicken-5-eggs
 export SALMONELLA_REPORTS_DIR=$HOME/salmonella/reports
 
-OS=$($CHICKEN_4_PREFIX/bin/csi -p '(software-version)')
-ARCH=$($CHICKEN_4_PREFIX/bin/csi -p '(machine-type)')
+
+if [ "$CHICKEN_TESTS_MAJOR_VERSION" = 4 ]; then
+    CHICKEN_TESTS_PREFIX=$CHICKEN_4_PREFIX
+    OS=$($CHICKEN_4_PREFIX/bin/csi -p '(software-version)')
+    ARCH=$($CHICKEN_4_PREFIX/bin/csi -p '(machine-type)')
+else
+    CHICKEN_TESTS_PREFIX=$CHICKEN_5_PREFIX
+    OS=$($CHICKEN_5_PREFIX/bin/csi -p '(begin (import (chicken platform)) (software-version))')
+    ARCH=$($CHICKEN_5_PREFIX/bin/csi -p '(begin (import (chicken platform)) (machine-type))')
+fi
 
 settings_files="\
     $SRC_CONF_DIR/shell-settings/${OS}/settings.sh
@@ -123,10 +135,10 @@ main() {
         if [ -e "$local_conf_path" ]; then
             echo "Loading $conf_path"
             echo "Loading $local_conf_path"
-            DEBUGBUILD=$debugbuild "$CHICKEN_4_PREFIX/bin/salmonella-run-publish" "$conf_path" "$local_conf_path"
+            DEBUGBUILD=$debugbuild "$CHICKEN_TESTS_PREFIX/bin/salmonella-run-publish" "$conf_path" "$local_conf_path"
         else
             echo "Loading $conf_path"
-            DEBUGBUILD=$debugbuild "$CHICKEN_4_PREFIX/bin/salmonella-run-publish" "$conf_path"
+            DEBUGBUILD=$debugbuild "$CHICKEN_TESTS_PREFIX/bin/salmonella-run-publish" "$conf_path"
         fi
         [ -d salmonella-run-publish ] && mv salmonella-run-publish "salmonella-$conf"
     done