~ salmonella-environment-setup (master) 22bf91fe8c9befa934af805fc15b1d68bef47220

commit 22bf91fe8c9befa934af805fc15b1d68bef47220
Author:     Mario Domenech Goulart <mario@parenteses.org>
AuthorDate: Mon Dec 14 19:07:32 2020 +0100
Commit:     Mario Domenech Goulart <mario@parenteses.org>
CommitDate: Mon Dec 14 19:07:32 2020 +0100

    DEBUGBUILD now set via salmonella-run-publish parameter

diff --git a/conf/common/debugbuild.scm b/conf/common/debugbuild.scm
index 522876d..e6d55b8 100644
--- a/conf/common/debugbuild.scm
+++ b/conf/common/debugbuild.scm
@@ -1,3 +1,5 @@
+(debug-build? #t)
+
 (branch-publish-transformer
   (lambda (branch)
     (string-append branch "-debugbuild")))
diff --git a/run-salmonella.sh b/run-salmonella.sh
index 006e9b9..94f6994 100755
--- a/run-salmonella.sh
+++ b/run-salmonella.sh
@@ -111,10 +111,6 @@ main() {
     # Remove leftovers from previous executions
     rm -rf salmonella-run-publish
 
-    # The DEBUGBUILD build variable is set according to configuration
-    # filenames.  If conf file names contain "debugbuild", DEBUGBUILD
-    # is set.
-    debugbuild=
     for conf in $confs; do
         # The inline egg writes some stuff to the home dir
         rm -rf ~/.chicken-inline
@@ -122,12 +118,6 @@ main() {
         # Remove leftovers from previous executions
         rm -rf salmonella-$conf
 
-        if echo "$conf" | grep -q debugbuild; then
-            debugbuild=1
-        else
-            debugbuild=
-        fi
-
         run_hooks
 
         conf_path=$SRC_CONF_DIR/${conf}.conf
@@ -135,10 +125,10 @@ main() {
         if [ -e "$local_conf_path" ]; then
             echo "Loading $conf_path"
             echo "Loading $local_conf_path"
-            DEBUGBUILD=$debugbuild "$CHICKEN_TESTS_PREFIX/bin/salmonella-run-publish" "$conf_path" "$local_conf_path"
+            "$CHICKEN_TESTS_PREFIX/bin/salmonella-run-publish" "$conf_path" "$local_conf_path"
         else
             echo "Loading $conf_path"
-            DEBUGBUILD=$debugbuild "$CHICKEN_TESTS_PREFIX/bin/salmonella-run-publish" "$conf_path"
+            "$CHICKEN_TESTS_PREFIX/bin/salmonella-run-publish" "$conf_path"
         fi
         [ -d salmonella-run-publish ] && mv salmonella-run-publish "salmonella-$conf"
     done