adding format to output filename hoping to mitigate tests failures

Author: maureeungaro

api/meson.build

@@ -45,17 +45,17 @@ test_dir = meson.current_build_dir() + '/../test'
 test('api_create_system',
      python_exe,
      env : {'PYTHONDONTWRITEBYTECODE': '1'},
-     args : [api_dir + 'system_template.py', '-s', 'test'], priority : 10)
+     args : [api_dir + 'system_template.py', '-s', 'test'], priority : 5)
 foreach format : ['ascii', 'sqlite']
     test('api_template_build_geometry_in_test_for_format_' + format,
          python_exe,
          env : {'PYTHONDONTWRITEBYTECODE': '1'},
-         args : ['test.py', '-f', format], workdir : test_dir, priority : -10)
+         args : ['test.py', '-f', format], workdir : test_dir, priority : -1)
     test('api_run_gemc_for_format_' + format,
          gemc, args : ['test.yaml', '-gsystem="[{name: test, factory: ' + format + '}]" '],
          workdir : test_dir,
          env : project_test_env,
-         priority : -20)
+         priority : -2)
 endforeach
 
 # replace geometry with templates
@@ -70,16 +70,16 @@ foreach volume: g4objects.keys()
     test('api_create_template_system_with' + volume,
          python_exe,
          env : {'PYTHONDONTWRITEBYTECODE': '1'},
-         args : [api_dir + 'system_template.py', '-s', test_name], priority : 10)
+         args : [api_dir + 'system_template.py', '-s', test_name], priority : 4)
     test('api_template_replace_geometry_with' + volume,
          python_exe,
          env : {'PYTHONDONTWRITEBYTECODE': '1'},
-         args: [api_dir + 'system_template.py', '-gv', volume, '-gvp', pars, geo_py, sub_name], workdir : test_dir, priority : -10)
+         args: [api_dir + 'system_template.py', '-gv', volume, '-gvp', pars, geo_py, sub_name], workdir : test_dir, priority : -3)
     foreach format : ['ascii', 'sqlite']
         test('api_template_build_geometry_in_test_of_replacing_geometry_with' + volume + '_with_format' + format,
              python_exe,
              env : {'PYTHONDONTWRITEBYTECODE': '1'},
-             args : [python_main, '-f', format], workdir : test_dir, priority : -20)
+             args : [python_main, '-f', format], workdir : test_dir, priority : -4)
         test('api_run_gemc_with_replaced_geometry_using_' + volume + '_with_format' + format,
              gemc,
              args : [yaml_file, '-gsystem="[{name: ' + test_name + ', factory: ' + format + '}]" '],

ci/build.sh

@@ -98,8 +98,8 @@ echo " ldd of $GEMC/bin/gemc:" >> $compile_log | tee -a
 
 # if on unix, use ldd , if on mac, use otool -L
 if [[ "$(uname)" == "Darwin" ]]; then
-  otool -L $GEMC/bin/gemc || exit 1
+  otool -L $GEMC/bin/gemc
 else
-  ldd $GEMC/bin/gemc || exit 1  >> $compile_log | tee -a
+  ldd $GEMC/bin/gemc >> $compile_log | tee -a
 fi
 

ci/discover-docker-matrix.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 # Discover dockerfiles: dockerfiles/Dockerfile-gemc-<tag>-<os>
-# Outputs for GitHub Actions:
+# Emits for GitHub Actions:
 #   - matrix: {"include":[{"file":..., "tag":..., "os":..., "latest":true|false}, ...]}
 #   - image : ghcr.io/<owner>/gemc
 # Works on macOS (BSD utils), Linux, and GHA.
@@ -20,7 +20,7 @@ IMAGE="ghcr.io/$OWNER_LOWER/gemc"
 
 TMP_TSV="$(mktemp)"
 
-# Glob-based enumeration (portable; avoids read -d / -print0)
+# Glob-based enumeration (portable)
 set -- "$DIR"/Dockerfile-gemc-*
 if [ "$1" = "$DIR/Dockerfile-gemc-*" ]; then
   echo "No matching dockerfiles found under '$DIR' (expected Dockerfile-gemc-<tag>-<os>)." >&2
@@ -56,7 +56,7 @@ if [ ! -s "$TMP_TSV" ]; then
   exit 1
 fi
 
-# Build JSON with POSIX/BSD awk
+# Build JSON with POSIX/BSD awk (avoid /\"/ to silence BSD awk warning)
 JSON=$(
   awk -F '\t' '
     BEGIN { n=0 }
@@ -70,9 +70,9 @@ JSON=$(
       for (i=1; i<=n; i++) {
         latest = (W[i] == max[ O[i] ]) ? "true" : "false"
 
-        f=F[i]; gsub(/\\/,"\\\\",f); gsub(/\"/,"\\\"",f)
-        t=T[i]; gsub(/\\/,"\\\\",t); gsub(/\"/,"\\\"",t)
-        o=O[i]; gsub(/\\/,"\\\\",o); gsub(/\"/,"\\\"",o)
+        f=F[i]; gsub(/\\/,"\\\\",f); gsub(/"/,"\\\"",f)
+        t=T[i]; gsub(/\\/,"\\\\",t); gsub(/"/,"\\\"",t)
+        o=O[i]; gsub(/\\/,"\\\\",o); gsub(/"/,"\\\"",o)
 
         printf "%s{\"file\":\"%s\",\"tag\":\"%s\",\"os\":\"%s\",\"latest\":%s}",
                (i>1?",":""), f, t, o, latest
@@ -83,7 +83,6 @@ JSON=$(
 )
 
 COUNT=$(wc -l < "$TMP_TSV" | tr -d '[:space:]')
-rm -f "$TMP_TSV"
 
 # Emit for Actions if available; else print locally
 if [ -n "${GITHUB_OUTPUT:-}" ]; then
@@ -99,3 +98,7 @@ else
 fi
 
 echo "Discovered $COUNT dockerfile(s). Image base: $IMAGE"
+echo "Dockerfiles found:"
+awk -F '\t' '{print " - " $1}' "$TMP_TSV"
+
+rm -f "$TMP_TSV"

dockerfiles/Dockerfile-gemc-dev3-almalinux94

@@ -3,7 +3,7 @@ LABEL maintainer="Maurizio Ungaro <ungaro@jlab.org>"
 
 # run shell instead of sh
 SHELL ["/bin/bash", "-c"]
-ENV AUTOBUILD 1
+ENV AUTOBUILD=1
 
 RUN echo "module load gemc/dev3" >> /etc/profile.d/localSetup.sh
 

dockerfiles/Dockerfile-gemc-dev3-fedora36

@@ -3,7 +3,7 @@ LABEL maintainer="Maurizio Ungaro <ungaro@jlab.org>"
 
 # run shell instead of sh
 SHELL ["/bin/bash", "-c"]
-ENV AUTOBUILD 1
+ENV AUTOBUILD=1
 
 RUN echo "module load gemc/dev3" >> /etc/profile.d/localSetup.sh
 

dockerfiles/Dockerfile-gemc-dev3-fedora40

@@ -3,7 +3,7 @@ LABEL maintainer="Maurizio Ungaro <ungaro@jlab.org>"
 
 # run shell instead of sh
 SHELL ["/bin/bash", "-c"]
-ENV AUTOBUILD 1
+ENV AUTOBUILD=1
 
 RUN echo "module load gemc/dev3" >> /etc/profile.d/localSetup.sh
 

dockerfiles/Dockerfile-gemc-dev3-ubuntu24

@@ -3,7 +3,7 @@ LABEL maintainer="Maurizio Ungaro <ungaro@jlab.org>"
 
 # run shell instead of sh
 SHELL ["/bin/bash", "-c"]
-ENV AUTOBUILD 1
+ENV AUTOBUILD=1
 
 RUN echo "module load gemc/dev3" >> /etc/profile.d/localSetup.sh
 

examples/meson.build

@@ -30,8 +30,8 @@ foreach branch : examples_map.keys()
                 geo_test_name = 'examples_geo_' + branch + '_' + example + '_' + format + '_variation_' + variation
                 run_test_name_asci = 'examples_run_asci_output_' + branch + '_' + example + '_' + format + '_variation_' + variation
                 run_test_name_root = 'examples_run_root_output_' + branch + '_' + example + '_' + format + '_variation_' + variation
-                ascii_output = '-gstreamer="[{format: ascii, filename: out' + branch + variation + '}]"'
-                root_output = '-gstreamer="[{format: root, filename: out' + branch + variation + '}]"'
+                ascii_output = '-gstreamer="[{format: ascii, filename: out' + branch + variation + format + '}]"'
+                root_output = '-gstreamer="[{format: root, filename: out' + branch + variation + format + '}]"'
                 test(geo_test_name,
                      python_exe,
                      args : [example_dir + example + '.py', '-f', format, '-sql', sql_db, '-v', variation], # the sql flag is ignored for ascii format
@@ -47,32 +47,32 @@ foreach branch : examples_map.keys()
                      gemc,
                      args : [yaml_file, '-gsystem="[{name: ' + example + ', factory: ' + format + ', variation: ' + variation + '}]"', root_output, '-sql=' + sql_db],
                      workdir : example_dir,
-                     priority : -15)
+                     priority : -11)
             endforeach
 
             # Geometry building tests (runs loop): Loop over runs with fixed variation "default"
             foreach run_value : runs
                 geo_test_name = 'examples_geo_' + branch + '_' + example + '_' + format + '_run_' + run_value
                 run_test_name_asci = 'examples_run_asci_output_' + branch + '_' + example + '_' + format + '_run_' + run_value
                 run_test_name_root = 'examples_run_root_output_' + branch + '_' + example + '_' + format + '_run_' + run_value
-                ascii_output = '-gstreamer="[{format: ascii, filename: out' + branch + run_value + '}]"'
-                root_output = '-gstreamer="[{format: root, filename: out' + branch + run_value + '}]"'
+                ascii_output = '-gstreamer="[{format: ascii, filename: out' + branch + run_value + format + '}]"'
+                root_output = '-gstreamer="[{format: root, filename: out' + branch + run_value + format + '}]"'
                 test(geo_test_name,
                      python_exe,
                      args : [example_dir + example + '.py', '-f', format, '-sql', sql_db, '-r', run_value], # the sql flag is ignored for ascii format
                      workdir : example_dir,
                      env : { 'PYTHONDONTWRITEBYTECODE' : '1' },
-                     priority : 5)
+                     priority : 9)
                 test(run_test_name_asci,
                      gemc,
                      args : [yaml_file, '-gsystem="[{name: ' + example + ', factory: ' + format + ', runno:' + run_value + '}]"', ascii_output, '-sql=' + sql_db],
                      workdir : example_dir,
-                     priority : -22)
+                     priority : -12)
                 test(run_test_name_root,
                      gemc,
                      args : [yaml_file, '-gsystem="[{name: ' + example + ', factory: ' + format + ', runno:' + run_value + '}]"', root_output, '-sql=' + sql_db],
                      workdir : example_dir,
-                     priority : -27)
+                     priority : -13)
             endforeach
 
         endforeach

meson.build

@@ -148,7 +148,7 @@ foreach L : LD
                      args : [geo_python_script],
                      workdir : examples_dir,
                      env : { 'PYTHONDONTWRITEBYTECODE' : '1' },
-                     priority : 10)
+                     priority : 20)
             endforeach
         endif
 
@@ -176,7 +176,7 @@ foreach L : LD
                  exe,
                  env : project_test_env,
                  args : arguments,
-                 priority : -10)
+                 priority : -20)
         endforeach
     endif
     foreach include_dir : additional_includes
@@ -259,7 +259,8 @@ foreach opt_dict : test_options
             gemc,
             args : test_arguments + gemc_test_sqlite,
             # suite : 'gemc',
-            timeout : 60          # adjust as needed
+            timeout : 60,          # adjust as needed
+            priority: -20
         )
     endforeach
 endforeach