cleanup

buildscripts/criterion.sh

@@ -6,4 +6,10 @@ rm -f ./${criterion_target}
 
 cmake --build . --target $(basename ${criterion_target})
 
-timeout 10 ./${criterion_target} || exit 2
+out_file="./$(dirname ${criterion_target})/Testing/$(basename ${criterion_target}).out"
+
+timeout 10 ./${criterion_target} > ${out_file}  2>&1 || {
+    tail -n 10 ${out_file}
+    rm -f ${out_file}
+    exit 2
+}

src/libraries/test_cpp_lib/include/test_cpp_lib.hpp

@@ -0,0 +1 @@
+void sayyeah();

src/libraries/test_cpp_lib/test_cpp_lib.cpp

@@ -0,0 +1,9 @@
+#include "include/test_cpp_lib.hpp"
+
+#include <iostream>
+
+using std::cout, std::endl;
+
+void sayyeah() {
+    cout << "Yeah!" << endl;
+}

src/programs/c_endless_loop/main.c

@@ -4,7 +4,7 @@ int main(int argc, char ** argv) {
     unsigned long ticker=0;
     while(1) {
         if(++ticker%80==0) {
-            printf("%d\n",ticker/100);
+            printf("%lu\n",ticker/100);
         }
     }
 }

src/programs/cpp_program_00/deps.txt

@@ -0,0 +1 @@
+test_cpp_lib

src/programs/cpp_program_00/main.cpp

@@ -0,0 +1,5 @@
+#include <test_cpp_lib.hpp>
+
+int main(int argc, char ** argv) {
+    sayyeah();
+}

tests/criterion/criterion_cpp/deps.txt

@@ -0,0 +1 @@
+test_cpp_lib

tests/criterion/criterion_cpp/test00.cpp

@@ -0,0 +1,9 @@
+#include <cmath>
+#include <criterion/criterion.h>
+
+#include <test_cpp_lib.hpp>
+
+Test(cpp, sayyeah) { 
+    sayyeah();
+    cr_assert(1);
+}

tests/criterion/criterion_echo/deps.txt

@@ -1 +1,2 @@
+test_c_lib
 m

tests/criterion/criterion_echo/test00.cpp → tests/criterion/criterion_echo/test00.c

@@ -1,6 +1,12 @@
-#include <cmath>
+#include <math.h>
 #include <criterion/criterion.h>
+#include <test_c_lib.h>
 
 Test(misc, passing) { cr_assert(1); }
 
 Test(misc, pi) { cr_assert(fabs(M_PI - 3.141) < 0.01); }
+
+Test(misc, say_hello) {
+    say_hello();
+    cr_assert(1);
+}