Commit a56089e91cdd1ec7b062f4f7c9b17764de6b2703
2022-12-21T15:51:25
test_file_compare
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81
diff --git a/.cpkg/c3.sysdef.lisp b/.cpkg/c3.sysdef.lisp
new file mode 100644
index 0000000..84198b5
--- /dev/null
+++ b/.cpkg/c3.sysdef.lisp
@@ -0,0 +1,10 @@
+
+(in-package :cl-user)
+
+(defpackage :c3.system
+ (:use :cl :cpkg))
+
+(in-package :c3.system)
+
+(define-system :c3
+ :depends-on (:libmd))
diff --git a/test/test.c b/test/test.c
index 6b54e5f..8bb4142 100644
--- a/test/test.c
+++ b/test/test.c
@@ -37,33 +37,37 @@ void test_context (const char *context)
int test_file_compare (const char *path_a, const char *path_b)
{
- FILE *fp_a = fopen(path_a, "rb");
- FILE *fp_b = fopen(path_b, "rb");
+ FILE *fp_a;
+ FILE *fp_b;
char buf_a[1024];
char buf_b[1024];
- int r;
- if (fp_a == fp_b)
- return 0;
- if (fp_a == NULL)
- return -1;
- if (fp_b == NULL)
- return 1;
- /* TODO: use fread and check how many bytes are read */
- while (fgets(buf_a, 1024, fp_a) != NULL) {
- if (fgets(buf_b, 1024, fp_b) == NULL) {
- test_ko();
- return 1;
- }
- /* TODO: use memcmp for NUL bytes */
- if ((r = strcmp(buf_a, buf_b))) {
- test_ko();
- return r;
+ unsigned lineno = 0;
+ if (path_a == path_b)
+ goto ok;
+ if (! (fp_a = fopen(path_a, "rb")))
+ goto ko;
+ if (! (fp_b = fopen(path_b, "rb")))
+ goto ko;
+ while (1) {
+ lineno++;
+ if (! fgets(buf_a, sizeof(buf_a), fp_a)) {
+ if (fgets(buf_b, sizeof(buf_b), fp_b))
+ goto ko;
+ goto ok;
}
+ if (! fgets(buf_b, sizeof(buf_b), fp_b))
+ goto ko;
+ if (strncmp(buf_a, buf_b, sizeof(buf_a)))
+ goto ko;
}
- if (fgets(buf_b, 1024, fp_b) != NULL) {
- test_ko();
- return -1;
- }
+ /* never reached */
+ ko:
+ printf("\n%sFiles %s and %s differ line %u.%s",
+ TEST_COLOR_KO,
+ path_a, path_b, lineno,
+ TEST_COLOR_RESET);
+ test_ko();
+ ok:
test_ok();
return 0;
}