Make tmc-check files backwards compatible

Heliozoa · Heliozoa · commit 5034a4e0ba5a · 2021-10-01T13:14:45.000+03:00
diff --git a/plugins/make/tests/data/failing-exercise/test/tmc-check.c b/plugins/make/tests/data/failing-exercise/test/tmc-check.c
@@ -51,13 +51,23 @@ void tmc_set_tcase_points(TCase *tc, const char *tc_name, const char *points)
     parse_points(points, &all_points);
 }
 
+#if CHECK_MINOR_VERSION < 15
+void _tmc_register_test(Suite *s, TFun tf, const char *fname, const char *points)
+{
+    TCase *tc = tcase_create(fname);
+    tmc_set_tcase_points(tc, fname, points);
+    _tcase_add_test(tc, tf, tname, 0, 0, 0, 1);
+    suite_add_tcase(s, tc);
+}
+#else
 void _tmc_register_test(Suite *s, const TTest *tt, const char *fname, const char *points)
 {
     TCase *tc = tcase_create(fname);
     tmc_set_tcase_points(tc, fname, points);
     _tcase_add_test(tc, tt, 0, 0, 0, 1);
     suite_add_tcase(s, tc);
 }
+#endif
 
 void tmc_set_suite_points(Suite *s, const char *s_name, const char *points)
 {
diff --git a/plugins/make/tests/data/failing-exercise/test/tmc-check.h b/plugins/make/tests/data/failing-exercise/test/tmc-check.h
@@ -16,8 +16,13 @@ Suite* tmc_suite_create(const char *name, const char *points);
  *
  * One can also register the test function normally and then call tmc_set_tcase_points.
  */
+#if CHECK_MINOR_VERSION < 15
+#define tmc_register_test(suite, tf, points) _tmc_register_test((suite), (tf), "" # tf, points)
+void _tmc_register_test(Suite *s, TFun tf, const char *fname, const char *points);
+#else
 #define tmc_register_test(suite, tt, points) _tmc_register_test((suite), (tt), "" # tt, points)
 void _tmc_register_test(Suite *s, const TTest *tt, const char *fname, const char *points);
+#endif
 
 
 /**
diff --git a/plugins/make/tests/data/passing-exercise/test/tmc-check.c b/plugins/make/tests/data/passing-exercise/test/tmc-check.c
@@ -51,13 +51,23 @@ void tmc_set_tcase_points(TCase *tc, const char *tc_name, const char *points)
     parse_points(points, &all_points);
 }
 
+#if CHECK_MINOR_VERSION < 15
+void _tmc_register_test(Suite *s, TFun tf, const char *fname, const char *points)
+{
+    TCase *tc = tcase_create(fname);
+    tmc_set_tcase_points(tc, fname, points);
+    _tcase_add_test(tc, tf, tname, 0, 0, 0, 1);
+    suite_add_tcase(s, tc);
+}
+#else
 void _tmc_register_test(Suite *s, const TTest *tt, const char *fname, const char *points)
 {
     TCase *tc = tcase_create(fname);
     tmc_set_tcase_points(tc, fname, points);
     _tcase_add_test(tc, tt, 0, 0, 0, 1);
     suite_add_tcase(s, tc);
 }
+#endif
 
 void tmc_set_suite_points(Suite *s, const char *s_name, const char *points)
 {
diff --git a/plugins/make/tests/data/passing-exercise/test/tmc-check.h b/plugins/make/tests/data/passing-exercise/test/tmc-check.h
@@ -16,8 +16,13 @@ Suite* tmc_suite_create(const char *name, const char *points);
  *
  * One can also register the test function normally and then call tmc_set_tcase_points.
  */
+#if CHECK_MINOR_VERSION < 15
+#define tmc_register_test(suite, tf, points) _tmc_register_test((suite), (tf), "" # tf, points)
+void _tmc_register_test(Suite *s, TFun tf, const char *fname, const char *points);
+#else
 #define tmc_register_test(suite, tt, points) _tmc_register_test((suite), (tt), "" # tt, points)
 void _tmc_register_test(Suite *s, const TTest *tt, const char *fname, const char *points);
+#endif
 
 
 /**
diff --git a/plugins/make/tests/data/valgrind-failing-exercise/test/tmc-check.c b/plugins/make/tests/data/valgrind-failing-exercise/test/tmc-check.c
@@ -51,13 +51,23 @@ void tmc_set_tcase_points(TCase *tc, const char *tc_name, const char *points)
     parse_points(points, &all_points);
 }
 
+#if CHECK_MINOR_VERSION < 15
+void _tmc_register_test(Suite *s, TFun tf, const char *fname, const char *points)
+{
+    TCase *tc = tcase_create(fname);
+    tmc_set_tcase_points(tc, fname, points);
+    _tcase_add_test(tc, tf, tname, 0, 0, 0, 1);
+    suite_add_tcase(s, tc);
+}
+#else
 void _tmc_register_test(Suite *s, const TTest *tt, const char *fname, const char *points)
 {
     TCase *tc = tcase_create(fname);
     tmc_set_tcase_points(tc, fname, points);
     _tcase_add_test(tc, tt, 0, 0, 0, 1);
     suite_add_tcase(s, tc);
 }
+#endif
 
 void tmc_set_suite_points(Suite *s, const char *s_name, const char *points)
 {
diff --git a/plugins/make/tests/data/valgrind-failing-exercise/test/tmc-check.h b/plugins/make/tests/data/valgrind-failing-exercise/test/tmc-check.h
@@ -16,8 +16,13 @@ Suite* tmc_suite_create(const char *name, const char *points);
  *
  * One can also register the test function normally and then call tmc_set_tcase_points.
  */
+#if CHECK_MINOR_VERSION < 15
+#define tmc_register_test(suite, tf, points) _tmc_register_test((suite), (tf), "" # tf, points)
+void _tmc_register_test(Suite *s, TFun tf, const char *fname, const char *points);
+#else
 #define tmc_register_test(suite, tt, points) _tmc_register_test((suite), (tt), "" # tt, points)
 void _tmc_register_test(Suite *s, const TTest *tt, const char *fname, const char *points);
+#endif
 
 
 /**
diff --git a/tmc-langs/tests/data/some_course/MakeExercise/test/tmc-check.c b/tmc-langs/tests/data/some_course/MakeExercise/test/tmc-check.c
@@ -51,13 +51,23 @@ void tmc_set_tcase_points(TCase *tc, const char *tc_name, const char *points)
     parse_points(points, &all_points);
 }
 
+#if CHECK_MINOR_VERSION < 15
+void _tmc_register_test(Suite *s, TFun tf, const char *fname, const char *points)
+{
+    TCase *tc = tcase_create(fname);
+    tmc_set_tcase_points(tc, fname, points);
+    _tcase_add_test(tc, tf, tname, 0, 0, 0, 1);
+    suite_add_tcase(s, tc);
+}
+#else
 void _tmc_register_test(Suite *s, const TTest *tt, const char *fname, const char *points)
 {
     TCase *tc = tcase_create(fname);
     tmc_set_tcase_points(tc, fname, points);
     _tcase_add_test(tc, tt, 0, 0, 0, 1);
     suite_add_tcase(s, tc);
 }
+#endif
 
 void tmc_set_suite_points(Suite *s, const char *s_name, const char *points)
 {
diff --git a/tmc-langs/tests/data/some_course/MakeExercise/test/tmc-check.h b/tmc-langs/tests/data/some_course/MakeExercise/test/tmc-check.h
@@ -16,8 +16,13 @@ Suite* tmc_suite_create(const char *name, const char *points);
  *
  * One can also register the test function normally and then call tmc_set_tcase_points.
  */
+#if CHECK_MINOR_VERSION < 15
+#define tmc_register_test(suite, tf, points) _tmc_register_test((suite), (tf), "" # tf, points)
+void _tmc_register_test(Suite *s, TFun tf, const char *fname, const char *points);
+#else
 #define tmc_register_test(suite, tt, points) _tmc_register_test((suite), (tt), "" # tt, points)
 void _tmc_register_test(Suite *s, const TTest *tt, const char *fname, const char *points);
+#endif
 
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -51,13 +51,23 @@ void tmc_set_tcase_points(TCase tc, const char tc_name, const char *points)`
`51`	`51`	`parse_points(points, &all_points);`
`52`	`52`	`}`
`53`	`53`
	`54`	`+#if CHECK_MINOR_VERSION < 15`
	`55`	`+void _tmc_register_test(Suite s, TFun tf, const char fname, const char *points)`
	`56`	`+{`
	`57`	`+ TCase *tc = tcase_create(fname);`
	`58`	`+ tmc_set_tcase_points(tc, fname, points);`
	`59`	`+ _tcase_add_test(tc, tf, tname, 0, 0, 0, 1);`
	`60`	`+ suite_add_tcase(s, tc);`
	`61`	`+}`
	`62`	`+#else`
`54`	`63`	`void _tmc_register_test(Suite s, const TTest tt, const char fname, const char points)`
`55`	`64`	`{`
`56`	`65`	`TCase *tc = tcase_create(fname);`
`57`	`66`	`tmc_set_tcase_points(tc, fname, points);`
`58`	`67`	`_tcase_add_test(tc, tt, 0, 0, 0, 1);`
`59`	`68`	`suite_add_tcase(s, tc);`
`60`	`69`	`}`
	`70`	`+#endif`
`61`	`71`
`62`	`72`	`void tmc_set_suite_points(Suite s, const char s_name, const char *points)`
`63`	`73`	`{`