Work on scripts for CI app tests

Author: daboehme

test/apptests/CMakeLists.txt

@@ -0,0 +1,31 @@
+include_directories("../../src/caliper")
+
+# build the C/C++ CI test apps
+
+set(CALIPER_CI_CXX_TEST_APPS
+  ci_test_basic)
+set(CALIPER_CI_C_TEST_APPS
+  ci_test_ann_c)
+
+foreach(app ${CALIPER_CI_CXX_TEST_APPS})
+  add_executable(${app} ${app}.cpp)
+  target_link_libraries(${app} caliper)
+endforeach()
+
+foreach(app ${CALIPER_CI_C_TEST_APPS})
+  add_executable(${app} ${app}.c)
+  set_target_properties(${app} PROPERTIES LINKER_LANGUAGE CXX)
+  target_link_libraries(${app} caliper)
+endforeach()
+
+# add symlinks to the python test driver scripts
+set(PYTHON_SCRIPTS
+  test_basictrace.py
+  calipertest.py)
+
+foreach(file ${PYTHON_SCRIPTS})
+  add_custom_target(${file} ALL
+    COMMAND ${CMAKE_COMMAND} -E create_symlink 
+      ${CMAKE_CURRENT_SOURCE_DIR}/${file} 
+      ${CMAKE_CURRENT_BINARY_DIR}/${file})
+endforeach()

test/apptests/README.md

@@ -0,0 +1,5 @@
+Automated continuous integration application tests for Caliper
+========================
+
+This directory contains driver scripts and test cases for automated
+full application/workflow tests for continuous integration.

test/ci_tests/CMakeLists.txt

@@ -0,0 +1,18 @@
+// --- Caliper continuous integration test app for C annotation interface
+
+#include <cali.h>
+
+int main()
+{
+  cali_id_t iter_attr = 
+    cali_create_attribute("iteration", CALI_TYPE_INT, CALI_ATTR_ASVALUE);
+
+  cali_begin_string_byname("phase", "loop");
+
+  for (int i = 0; i < 4; ++i) {
+    cali_begin_int(iter_attr, i);
+    cali_end(iter_attr);
+  }
+
+  cali_end_byname("phase");
+}

test/ci_tests/README.md

@@ -0,0 +1,23 @@
+// --- Caliper continuous integration test app for basic trace test
+
+#include <Annotation.h>
+
+int main() 
+{
+    cali::Annotation phase_ann("phase");
+
+    phase_ann.begin("initialization");
+    const int count = 4;
+    phase_ann.end();
+
+    phase_ann.begin("loop");
+    
+    cali::Annotation iter_ann("iteration", CALI_ATTR_ASVALUE);
+
+    for (int i = 0; i < count; ++i) {
+        cali::Annotation::Guard
+            g_iter_ann(iter_ann.begin(i));
+    }
+
+    phase_ann.end();
+}

test/apptests/calipertest.py test/ci_tests/calipertest.py

@@ -8,11 +8,13 @@ class CaliperBasicTraceTest(unittest.TestCase):
     """ Caliper test case """
 
     def test_basic_trace(self):
-        target_cmd = [ 'cali-basic' ]
-        query_cmd  = [ '../src/tools/cali-query/cali-query', '-e' ]
+        target_cmd = [ './ci_test_basic' ]
+        query_cmd  = [ '../../src/tools/cali-query/cali-query', '-e' ]
 
-        caliper_config = { 'CALI_CONFIG_PROFILE'    : 'serial-trace', 
-                           'CALI_RECORDER_FILENAME' : 'stdout'        
+        caliper_config = {
+            'CALI_CONFIG_PROFILE'    : 'serial-trace',
+            'CALI_RECORDER_FILENAME' : 'stdout',
+            'CALI_LOG_VERBOSITY'     : '0'
         }
 
         query_output = calitest.run_test_with_query(target_cmd, query_cmd, caliper_config)