Consolidate tests, remove some superfluous test apps (LLNL#235)

Author: daboehme

src/services/event/EventTrigger.cpp

@@ -93,7 +93,7 @@ class EventTrigger
     }
 
     void check_attribute(Caliper* c, Channel* chn, const Attribute& attr) {
-        if (attr.skip_events())
+        if (attr.id() < 12 /* skip fixed metadata attributes */ || attr.skip_events())
             return;
 
         auto it = std::find(trigger_attr_names.begin(), trigger_attr_names.end(), attr.name());

src/services/trace/Trace.cpp

@@ -353,6 +353,7 @@ class Trace
         chn->events().finish_evt.connect(
             [instance](Caliper* c, Channel* chn){
                 // sT.deactivate_chn(chn);
+                instance->clear_cb(c, chn);
                 instance->finish_cb(c, chn);
                 delete instance;
             });

test/ci_app_tests/CMakeLists.txt

@@ -6,17 +6,14 @@ set(CALIPER_CI_CXX_TEST_APPS
   ci_test_aggregate
   ci_test_basic
   ci_test_binding
-  ci_test_esc
   ci_test_io
-  ci_test_loop
   ci_test_macros
   ci_test_multichannel
   ci_test_nesting
   ci_test_postprocess_snapshot
   ci_test_report
   ci_test_thread)
 set(CALIPER_CI_C_TEST_APPS
-  ci_dgemm_memtrack
   ci_test_alloc
   ci_test_alloc_hooks
   ci_test_c_ann

test/ci_app_tests/ci_dgemm_memtrack.c

@@ -1,15 +1,16 @@
 // --- Caliper continuous integration test app for C++ annotation class
 
-#include "caliper/Annotation.h"
-
-#include "caliper/common/Variant.h"
+#include "caliper/cali.h"
 
 int main()
 {
     std::map<const char*, cali::Variant> metadata = {
         { "meta.int", cali::Variant(42) }
     };
 
+    // Test proper escaping
+    cali_set_string_byname(" =\\weird \"\"attribute\"=  ", "  \\\\ weird,\" name\",");
+
     cali::Annotation phase_ann("phase", metadata);
     std::size_t size = 8;
     cali::Annotation size_annot("dgs");

test/ci_app_tests/ci_test_basic.cpp

@@ -10,12 +10,12 @@
 
 // test C and C++ macros
 
-void foo(int sleep_usec)
+void foo(int count, int sleep_usec)
 {
     CALI_CXX_MARK_FUNCTION;
 
     CALI_MARK_BEGIN("pre-loop");
-    CALI_WRAP_STATEMENT("foo.init", int count = 4);
+    CALI_WRAP_STATEMENT("foo.init", count = std::max(1, count));
     CALI_MARK_END("pre-loop");
 
     CALI_MARK_LOOP_BEGIN(fooloop, "fooloop");
@@ -40,7 +40,9 @@ int main(int argc, char* argv[])
     cali::ConfigManager mgr;
 
     if (argc > 2)
-        mgr.add(argv[2]);
+        if (std::string(argv[2]) != "none")
+            mgr.add(argv[2]);
+
     if (mgr.error()) {
         std::cerr << mgr.error_msg() << std::endl;
         return -1;
@@ -50,14 +52,17 @@ int main(int argc, char* argv[])
 
     CALI_MARK_FUNCTION_BEGIN;
 
-    const int count = 4;
+    int count = 4;
+
+    if (argc > 3)
+        count = std::max(1, std::stoi(argv[3]));
 
     CALI_CXX_MARK_LOOP_BEGIN(mainloop, "mainloop");
 
     for (int i = 0; i < count; ++i) {
         CALI_CXX_MARK_LOOP_ITERATION(mainloop, i);
 
-        foo(sleep_usec);
+        foo(count, sleep_usec);
     }
 
     CALI_CXX_MARK_LOOP_END(mainloop);

test/ci_app_tests/ci_test_esc.cpp

@@ -122,14 +122,14 @@ def test_usec_unit_selection(self):
             }))
 
     def test_largetrace(self):
-        target_cmd = [ './ci_test_loop', '80000' ]
+        target_cmd = [ './ci_test_macros', '0', 'none', '400' ]
         query_cmd  = [ '../../src/tools/cali-query/cali-query', '-e' ]
 
         caliper_config = {
             'CALI_SERVICES_ENABLE'   : 'event,trace,report',
             # 'CALI_EVENT_ENABLE_SNAPSHOT_INFO' : 'false',
             'CALI_REPORT_FILENAME'   : 'stdout',
-            'CALI_REPORT_CONFIG'     : 'select function,count() group by function format cali',
+            'CALI_REPORT_CONFIG'     : 'select function,event.end#loop,count() group by function,event.end#loop format cali',
             'CALI_TRACE_BUFFER_SIZE' : '1',
             'CALI_LOG_VERBOSITY'     : '0'
         }
@@ -138,7 +138,7 @@ def test_largetrace(self):
         snapshots = cat.get_snapshots_from_text(query_output)
 
         self.assertTrue(cat.has_snapshot_with_attributes(
-            snapshots, { 'function' : 'main/foo', 'count' : '80000'}))
+            snapshots, { 'function' : 'main/foo', 'event.end#loop': 'fooloop', 'count' : '400' }))
 
 
     def test_globals(self):
@@ -160,8 +160,8 @@ def test_globals(self):
             snapshots, { 'cali.caliper.version' } ) )
 
     def test_esc(self):
-        target_cmd = [ './ci_test_esc' ]
-        query_cmd  = [ '../../src/tools/cali-query/cali-query', '-j' ]
+        target_cmd = [ './ci_test_basic' ]
+        query_cmd  = [ '../../src/tools/cali-query/cali-query', '-j', '-s', 'cali.event.set' ]
 
         caliper_config = {
             'CALI_CONFIG_PROFILE'    : 'serial-trace',

test/ci_app_tests/ci_test_loop.cpp

@@ -134,7 +134,7 @@ def test_hatchetcontroller(self):
 
 
     def test_esc(self):
-        target_cmd = [ './ci_test_esc' ]
+        target_cmd = [ './ci_test_basic' ]
         query_cmd  = [ '../../src/tools/cali-query/cali-query',
                        '-q', 'select *,count() format json-split' ]
 

test/ci_app_tests/ci_test_macros.cpp

@@ -31,7 +31,7 @@ def test_libpfm_counting(self):
             snapshots, { 'libpfm.counter.cycles', 'phase', 'iteration' }))
 
     def test_libpfm_sampling(self):
-        target_cmd = [ './ci_dgemm_memtrack' ]
+        target_cmd = [ './ci_test_macros', '50', 'none', '100' ]
         query_cmd  = [ '../../src/tools/cali-query/cali-query', '-e' ]
 
         caliper_config = {