cleanup

.gitignore

@@ -1 +1,2 @@
 build/
+tests/io_tests/*/*.IS

CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
 PROJECT(cmake_test_template)
 INCLUDE(CTest)
 

buildscripts/criterion.sh

@@ -6,4 +6,4 @@ rm -f ./${criterion_target}
 
 cmake --build . --target $(basename ${criterion_target})
 
-./${criterion_target} || exit 2
+timeout 10 ./${criterion_target} || exit 2

buildscripts/test.sh

@@ -27,21 +27,21 @@ shift
 } 
 
 
-${CMD} < ${IN_FILE} > ${OUT_FILE}.IS 2> ${ERR_FILE}.IS
+timeout 10 ${CMD} < ${IN_FILE} > ${OUT_FILE}.IS 2> ${ERR_FILE}.IS
 
 diff ${OUT_FILE} ${OUT_FILE}.IS > /dev/null
 out_result=$?
 
-echo "STDOUT DIFF lines marked with - are missing one with + are excessive"
-diff -u  ${OUT_FILE} ${OUT_FILE}.IS | tail +4 | sed s/^/">>>"/ | sed s/$/'\\n'/
+echo "Last 10 lines of STDOUT DIFF lines marked with - are missing one with + are excessive"
+diff -u  ${OUT_FILE} ${OUT_FILE}.IS | tail +4 | tail -n 10 | sed s/^/">>>"/ | sed s/$/'\\n'/
 
 rm -f ${OUT_FILE}.IS
 
 diff ${ERR_FILE} ${ERR_FILE}.IS > /dev/null
 err_result=$?
 
-echo "STDERR DIFF lines marked with - are missing one with + are excessive"
-diff -u  ${ERR_FILE} ${ERR_FILE}.IS | tail +4 | sed s/^/">>>"/ | sed s/$/'\\n'/
+echo "Last 10 lines of STDERR DIFF lines marked with - are missing one with + are excessive"
+diff -u  ${ERR_FILE} ${ERR_FILE}.IS | tail +4 | tail -n 10 | sed s/^/">>>"/ | sed s/$/'\\n'/
 
 rm -f ${ERR_FILE}.IS
 

compile_commands.json

@@ -0,0 +1 @@
+/home/robert/Unison/Development/templates/cmake_template/out/Debug/compile_commands.json

src/libraries/test_c_lib/test_c_lib.c

@@ -0,0 +1,8 @@
+#include "include/test_c_lib.h"
+
+#include <stdio.h>
+
+void say_hello() {
+  printf("Say ");
+  printf("hello!\n");
+}

src/programs/c_endless_loop/deps.txt

@@ -0,0 +1 @@
+m

src/programs/c_endless_loop/main.c

@@ -0,0 +1,10 @@
+#include <stdio.h>
+
+int main(int argc, char ** argv) {
+    unsigned long ticker=0;
+    while(1) {
+        if(++ticker%80==0) {
+            printf("%d\n",ticker/100);
+        }
+    }
+}

src/programs/c_program_00/deps.txt

@@ -0,0 +1 @@
+m

src/programs/c_program_00/main.c

@@ -0,0 +1,6 @@
+#include <stdio.h>
+
+int main(int argc, char **argv) {
+  printf("This program was called with %d arguments.\n", argc);
+  printf("Hello World!\n");
+}

src/programs/c_program_01/deps.txt

@@ -0,0 +1,2 @@
+test_c_lib
+

src/programs/c_program_01/main.c

@@ -0,0 +1,9 @@
+#include <stdio.h>
+
+#include <test_c_lib.h>
+
+int main(int argc, char **argv) {
+  printf("Trying to confirm.\n");
+  say_hello();
+  return 0;
+}

tests/criterion/criterion_echo/deps.txt

@@ -1,2 +1 @@
-Echo
 m

tests/criterion/criterion_echo/test00.cpp

@@ -1,19 +1,6 @@
-#include <criterion/criterion.h>
-#include <echo.h>
 #include <cmath>
+#include <criterion/criterion.h>
 
-Test(misc, echo) {
-    echo("Test");
-}
-
-Test(misc, echo2) {
-    echo2();
-}
-
-Test(misc, passing) {
-    cr_assert(1);
-}
+Test(misc, passing) { cr_assert(1); }
 
-Test(misc, pi) {
-    cr_assert(fabs(M_PI -3.141) < 0.01);
-}
+Test(misc, pi) { cr_assert(fabs(M_PI - 3.141) < 0.01); }

tests/io_tests/c_endless_loop/00.out

@@ -0,0 +1 @@
+Willfailisfortestingendlessloop.

tests/io_tests/c_program_00/00.out

@@ -0,0 +1,2 @@
+This program was called with 1 arguments.
+Hello World!

tests/io_tests/c_program_00/01.out

@@ -0,0 +1,2 @@
+This program was called with 1 arguments.
+Hello World!

tests/io_tests/c_program_00/02.out

@@ -0,0 +1,2 @@
+This program was called with 1 arguments.
+Hello World!

tests/io_tests/c_program_01/00.out

@@ -0,0 +1,2 @@
+Trying to confirm.
+Say hello!