temp saving to test ci - some test still not passing

maureeungaro · maureeungaro · commit 97de3e23a051 · 2026-01-21T16:33:52.000-05:00
diff --git a/ci/build.sh b/ci/build.sh
@@ -68,10 +68,11 @@ test_options=(
 
 # Specific tests to run when sanitizer is enabled
 sanitizer_tests=(
+  -v
   api_run_gemc_with_replaced_geometry_using_G4Box_with_formatascii
-  test_gstreamer_csv
-  test_gparticle_double
-  test_event_dispenser
+  test_gstreamer_csv_verbose
+  test_gparticle_double_verbose
+  test_event_dispenser_verbose
   examples_geo_basic_simple_flux_ascii_variation_default
 )
 
diff --git a/dbselect/meson.build b/dbselect/meson.build
@@ -1,5 +1,5 @@
 sub_dir_name = meson.current_source_dir().split('/').get(-1)
-internal_deps = []
+internal_deps = ['goptions', 'guts', 'glogging', 'gtouchable', 'gdata', 'gtranslationTable', 'ghit', 'gfactory', 'gdynamicDigitization',  'g4system']
 
 with_gui = ['']
 if get_option('i_test')
diff --git a/eventDispenser/meson.build b/eventDispenser/meson.build
@@ -1,5 +1,5 @@
 sub_dir_name = meson.current_source_dir().split('/').get(-1)
-internal_deps = []
+internal_deps = ['goptions', 'guts', 'glogging', 'gtouchable', 'gdata', 'gtranslationTable', 'ghit', 'gfactory', 'gdynamicDigitization']
 
 example_source = files('examples/event_dispenser_example.cc')
 verbosities = ['-verbosity.eventdispenser=2',
diff --git a/g4dialog/meson.build b/g4dialog/meson.build
@@ -1,5 +1,5 @@
 sub_dir_name = meson.current_source_dir().split('/').get(-1)
-internal_deps = []
+internal_deps = ['goptions', 'guts', 'glogging']
 
 with_gui = ['']
 if get_option('i_test')
diff --git a/g4display/meson.build b/g4display/meson.build
@@ -1,5 +1,5 @@
 sub_dir_name = meson.current_source_dir().split('/').get(-1)
-internal_deps = []
+internal_deps = ['goptions', 'guts', 'glogging', 'gqtbuttonswidget']
 
 with_gui = ['']
 if get_option('i_test')
diff --git a/g4system/meson.build b/g4system/meson.build
@@ -1,5 +1,5 @@
 sub_dir_name = meson.current_source_dir().split('/').get(-1)
-internal_deps = []
+internal_deps = ['goptions', 'guts', 'glogging', 'gsystem', 'gfactory']
 
 example_source = files('examples/g4system_example.cc')
 examples_dir = get_option('prefix') + '/test/' + sub_dir_name
diff --git a/gbase/examples/test_gbase.cc b/gbase/examples/test_gbase.cc
@@ -1,8 +1,8 @@
 
 #include "gbase.h"
 
-constexpr const char* G1_LOGGER = "gdetector";
-constexpr const char* G2_LOGGER = "gfield";
+constexpr const char* G1_LOGGER = "hello1";
+constexpr const char* G2_LOGGER = "hello2";
 
 // derived with its own logger
 class g1 : public GBase<g1> {
diff --git a/gbase/meson.build b/gbase/meson.build
@@ -1,12 +1,12 @@
 sub_dir_name = meson.current_source_dir().split('/').get(-1)
-internal_deps = []
+internal_deps = ['glogging', 'goptions', 'guts']
 
 example_source = files('examples/test_gbase.cc')
 verbosity = [
-    '-verbosity.gdetector=2',
-    '-debug.gdetector=true',
-    '-verbosity.gfield=2',
-    '-debug.gfield=true'
+    '-verbosity.hello1=2',
+    '-debug.hello1=true',
+    '-verbosity.hello2=2',
+    '-debug.hello2=true'
 ]
 
 LD += {
diff --git a/gboard/meson.build b/gboard/meson.build
@@ -1,5 +1,5 @@
 sub_dir_name = meson.current_source_dir().split('/').get(-1)
-internal_deps = []
+internal_deps = ['glogging', 'goptions', 'guts']
 
 with_gui = ['']
 if get_option('i_test')
@@ -36,7 +36,7 @@ LD += {
     'sources' : sources,
     'headers' : headers,
     'moc_headers' : moc_headers,
-    'dependencies' : [yaml_cpp_dep, qt6_deps, clhep_deps, geant4_core_deps],
+    'dependencies' : [yaml_cpp_dep, qt6_deps, clhep_deps, geant4_deps],
     'internal_dependencies' : internal_deps,
     'additional_includes' : ['gboard'],
     'examples' : examples
diff --git a/gdata/meson.build b/gdata/meson.build
@@ -1,5 +1,5 @@
 sub_dir_name = meson.current_source_dir().split('/').get(-1)
-internal_deps = []
+internal_deps = ['goptions', 'guts', 'gtouchable', 'ghit']
 
 example_event_source = files('examples/event_example.cc')
 example_frame_source = files('examples/gframe_example.cc')
diff --git a/gdynamicDigitization/meson.build b/gdynamicDigitization/meson.build
@@ -1,5 +1,5 @@
 sub_dir_name = meson.current_source_dir().split('/').get(-1)
-internal_deps = []
+internal_deps = ['goptions', 'guts', 'glogging', 'gtouchable', 'gdata', 'gtranslationTable', 'ghit', 'gfactory']
 
 example_source = files('examples/plugin_load_example.cc')
 verbosities = [
diff --git a/gfactory/gdl.h b/gfactory/gdl.h
@@ -73,7 +73,7 @@ struct DynamicLib {
 			handle = load_lib(dlFileName);
 			if (handle == nullptr) {
 				char const* const dlopen_error = dlerror();
-				log->error(ERR_DLHANDLENOTFOUND, "File ", dlFileName, " found, but handle is null. Error: ",
+				log->error(ERR_DLHANDLENOTFOUND, "File ", dlFileName, " found, but handle is null. dlopen_error >> ",
 				           dlopen_error);
 			}
 			else { log->info(0, "Loaded ", dlFileName); }
diff --git a/gfactory/meson.build b/gfactory/meson.build
@@ -1,5 +1,5 @@
 sub_dir_name = meson.current_source_dir().split('/').get(-1)
-internal_deps = []
+internal_deps = ['glogging', 'goptions', 'guts']
 
 example_sourcess = files('examples/static_and_dynamic_example.cc', 'examples/ShapeFactory.cc')
 verbosities = [
diff --git a/gfields/meson.build b/gfields/meson.build
@@ -1,5 +1,5 @@
 sub_dir_name = meson.current_source_dir().split('/').get(-1)
-internal_deps = []
+internal_deps = ['goptions', 'guts', 'glogging']
 
 example_source = files('examples/test_gfield_dipole.cc')
 verbosities = ['-verbosity.gfield=2',
diff --git a/ghit/meson.build b/ghit/meson.build
@@ -1,5 +1,5 @@
 sub_dir_name = meson.current_source_dir().split('/').get(-1)
-internal_deps = []
+internal_deps = ['goptions', 'guts', 'gtouchable']
 
 example_source = files('examples/ghit_example.cc')
 verbosities = ['-verbosity.gtouchable=2',
diff --git a/goptions/meson.build b/goptions/meson.build
@@ -1,5 +1,5 @@
 sub_dir_name = meson.current_source_dir().split('/').get(-1)
-internal_deps = []
+internal_deps = ['guts']
 
 run_command('version.py', check : true)
 example_source = files('examples/define_options.cc')
diff --git a/gparticle/meson.build b/gparticle/meson.build
@@ -1,5 +1,5 @@
 sub_dir_name = meson.current_source_dir().split('/').get(-1)
-internal_deps = []
+internal_deps = ['goptions', 'guts', 'glogging']
 
 single = [ '-gparticle="[{name: e-, p: 2300, theta: 23.0}]"']
 double = ['-gparticle="[{name: e-, p: 2300, theta: 23.0}, {name: proton, multiplicity: 2, p: 1200, theta: 14.0, delta_theta: 10}]"']
diff --git a/gphysics/meson.build b/gphysics/meson.build
@@ -1,5 +1,5 @@
 sub_dir_name = meson.current_source_dir().split('/').get(-1)
-internal_deps = []
+internal_deps = ['goptions', 'guts', 'glogging']
 
 example_source = files('examples/gphysics_example.cc')
 verbosities = ['-verbosity.gphysics=2',
diff --git a/gqtbuttonswidget/meson.build b/gqtbuttonswidget/meson.build
@@ -1,5 +1,5 @@
 sub_dir_name = meson.current_source_dir().split('/').get(-1)
-internal_deps = []
+internal_deps = ['goptions', 'guts', 'glogging']
 
 sources = files(
     'gQtButtonsWidget.cc',
diff --git a/gsplash/meson.build b/gsplash/meson.build
@@ -1,5 +1,5 @@
 sub_dir_name = meson.current_source_dir().split('/').get(-1)
-internal_deps = []
+internal_deps = ['goptions', 'guts', 'glogging']
 
 with_gui = ['']
 if get_option('i_test')
diff --git a/gstreamer/meson.build b/gstreamer/meson.build
@@ -1,6 +1,6 @@
 # ── helpers / common ───────────────────────────────────────────────────────────
 sub_dir_name = meson.current_source_dir().split('/').get(-1)  # fine on *nix
-internal_deps = ['gtouchable', 'gdata', 'gtranslationTable', 'ghit']
+internal_deps = ['goptions', 'guts', 'glogging', 'gtouchable', 'gdata', 'gtranslationTable', 'ghit', 'gfactory', 'gdynamicDigitization']
 
 example_source = files('examples/gstreamer_example.cc')
 verbosities = [
diff --git a/gsystem/meson.build b/gsystem/meson.build
@@ -1,5 +1,5 @@
 sub_dir_name = meson.current_source_dir().split('/').get(-1)
-internal_deps = []
+internal_deps = ['goptions', 'guts', 'gtouchable', 'gfactory']
 
 # notice the test run on the installation dir, which does has 'examples' stripped from the path
 examples_dir = get_option('prefix') + '/test/' + sub_dir_name
diff --git a/gtouchable/meson.build b/gtouchable/meson.build
@@ -1,8 +1,7 @@
 sub_dir_name = meson.current_source_dir().split('/').get(-1)
-internal_deps = []
+internal_deps = ['goptions', 'guts']
 
 example_source = files('examples/gtouchable_example.cc')
-
 verbosities = ['-verbosity.gtouchable=2',
                '-debug.gtouchable=true'
 ]
diff --git a/gtranslationTable/meson.build b/gtranslationTable/meson.build
@@ -1,5 +1,5 @@
 sub_dir_name = meson.current_source_dir().split('/').get(-1)
-internal_deps = []
+internal_deps = ['goptions', 'guts', 'gtouchable']
 
 example_source = files('examples/tt_example.cc')
 verbosities = ['-verbosity.gtranslationtable=2',
diff --git a/gtree/gtree.h b/gtree/gtree.h
@@ -5,6 +5,7 @@
 #include "gQtButtonsWidget.h" // Custom toggle button widget
 #include "g4volume.h"
 #include "gbase.h" // Provides application options/configuration
+#include "goptions.h"
 
 // qt
 #include <QWidget>
diff --git a/gtree/gtree_options.cc b/gtree/gtree_options.cc
@@ -1,6 +1,5 @@
 // gemc
 #include "dbselect_options.h"
-
 #include "gtree_options.h"
 
 namespace gtree {
diff --git a/gtree/meson.build b/gtree/meson.build
@@ -1,5 +1,6 @@
 sub_dir_name = meson.current_source_dir().split('/').get(-1)
-internal_deps = []
+#internal_deps = ['goptions', 'guts', 'glogging', 'g4system', 'gsystem']
+internal_deps = ['goptions', 'guts', 'glogging', 'gtouchable', 'gdata', 'gtranslationTable', 'ghit', 'gfactory', 'gdynamicDigitization',  'g4system', 'gsystem', 'gdetector', 'gstreamer']
 
 with_gui = ['']
 if get_option('i_test')
diff --git a/meson.build b/meson.build
@@ -54,14 +54,14 @@ subdir('gtouchable')
 subdir('ghit')
 subdir('gtranslationTable')
 subdir('gdata')
+subdir('gboard')
 subdir('gdynamicDigitization')
+subdir('gsystem') # uses api for testing
+subdir('gstreamer')
 subdir('eventDispenser')
 subdir('gqtbuttonswidget')
-subdir('gstreamer')
 subdir('g4display')
 subdir('g4dialog')
-subdir('gboard')
-subdir('gsystem') # uses api for testing
 subdir('g4system')
 subdir('gparticle')
 subdir('gphysics')
@@ -94,6 +94,7 @@ foreach L : LD
     qrc_compiled_sources = []
     qrc_examples_compiled_sources = []
 
+
     if not moc_headers.contains('')
         moc_sources = qt6.compile_moc(headers : moc_headers,
                                       dependencies : this_deps)
@@ -121,17 +122,19 @@ foreach L : LD
         install_headers(headers)
     endif
 
+    this_library_link_with = []
+    if not sources.contains('')
+        this_library_link_with += this_library
+    endif
+
+        foreach this_link_with : this_internal_libs
+        if lib_target_maps.has_key(this_link_with)
+            this_library_link_with += [lib_target_maps[this_link_with]]
+        endif
+    endforeach
+
     if plugins != empty_dict
         foreach name, sources : plugins
-            this_library_link_with = []
-            if not sources.contains('')
-                this_library_link_with = [this_library]
-            endif
-            foreach this_link_with : this_internal_libs
-                if lib_target_maps.has_key(this_link_with)
-                    this_library_link_with += [lib_target_maps[this_link_with]]
-                endif
-            endforeach
 
             shared_library(
                 name,
@@ -162,7 +165,6 @@ foreach L : LD
                                install_dir : examples_dir,
                                strip_directory : true,
                                follow_symlinks : true)
-
                 test(name,
                      python_exe,
                      args : [geo_python_script],
@@ -189,7 +191,8 @@ foreach L : LD
                 install : true,
                 dependencies : this_deps,
                 include_directories : all_includes + this_lib_name + additional_includes,
-                link_with : all_libs,
+#                link_with : all_libs,
+                link_with : this_library_link_with,
                 override_options : ['b_pie=true']
             )
             test(name,
