Changes by: flatcap
Update of /cvsroot/linux-ntfs/ntfs-driver-tng/scripts
In directory usw-pr-cvs1:/tmp/cvs-serv32589/scripts
Modified Files:
Makefile rl.c
Log Message:
build fixes for test cases
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/scripts/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- Makefile 11 Feb 2002 03:57:56 -0000 1.2
+++ Makefile 12 Feb 2002 21:42:58 -0000 1.3
@@ -65,19 +65,19 @@
testf:
$(RM) frag[1-6]
- $(CC) $(CFLAGS) -DTESTF -DTEST=1 rl.c -o rl
+ $(CC) $(CFLAGS) -DTESTF=1 rl.c -o rl
rl > frag1
- $(CC) $(CFLAGS) -DTESTF -DTEST=2 rl.c -o rl
+ $(CC) $(CFLAGS) -DTESTF=2 rl.c -o rl
rl > frag2
- $(CC) $(CFLAGS) -DTESTF -DTEST=3 rl.c -o rl
+ $(CC) $(CFLAGS) -DTESTF=3 rl.c -o rl
rl > frag3
- $(CC) $(CFLAGS) -DTESTF -DTEST=4 rl.c -o rl
+ $(CC) $(CFLAGS) -DTESTF=4 rl.c -o rl
rl > frag4
- $(CC) $(CFLAGS) -DTESTF -DTEST=5 rl.c -o rl
+ $(CC) $(CFLAGS) -DTESTF=5 rl.c -o rl
rl > frag5
- $(CC) $(CFLAGS) -DTESTF -DTEST=6 rl.c -o rl
+ $(CC) $(CFLAGS) -DTESTF=6 rl.c -o rl
rl > frag6
@echo
@for i in frag[1-6]; do \
- diff -qs $$i test/frag ; \
+ diff -qs $$i test/$$i ; \
done
@echo
Index: rl.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/scripts/rl.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -U2 -r1.18 -r1.19
--- rl.c 12 Feb 2002 21:36:48 -0000 1.18
+++ rl.c 12 Feb 2002 21:42:58 -0000 1.19
@@ -11,6 +11,6 @@
#define MULTI 1
#endif
-#ifndef TEST
-#define TEST 0
+#ifndef TESTF
+#define TESTF 0
#endif
@@ -964,5 +964,5 @@
#endif
-#if 0 || defined (TESTF)
+#if 1 || defined (TESTF)
/**
* fragged
@@ -1003,5 +1003,5 @@
// CASE 123 - WORKS FINE.
-#if 0 || (TEST == 1)
+#if 0 || (TESTF == 1)
rl1 = decompress_mapping_pairs (&vol, buf1, NULL);
if (IS_ERR (rl1))
@@ -1020,16 +1020,16 @@
#endif
-// CASE 132 - DOESN'T WORK YET.
-#if 0 || (TEST == 2)
+// CASE 132 - WORKS FINE
+#if 0 || (TESTF == 2)
rl1 = decompress_mapping_pairs (&vol, buf1, NULL);
if (IS_ERR (rl1))
return 1;
//printf ("rl1 %p\n", rl1);
-// rl_replace: FAILED
+// rl_append: OK
rl2 = decompress_mapping_pairs (&vol, buf3, rl1);
if (IS_ERR (rl2))
return 1;
//printf ("rl2 %p\n", rl2);
-// not looked at
+// rl_replace: OK
rl3 = decompress_mapping_pairs (&vol, buf2, rl2);
if (IS_ERR (rl3))
@@ -1039,10 +1039,10 @@
// CASE 213 - DOESN'T WORK YET.
-#if 0 || (TEST == 3)
+#if 0 || (TESTF == 3)
rl1 = decompress_mapping_pairs (&vol, buf2, NULL);
if (IS_ERR (rl1))
return 1;
//printf ("rl1 %p\n", rl1);
-// rl_append: FAILED
+// rl_replace: OK
rl2 = decompress_mapping_pairs (&vol, buf1, rl1);
if (IS_ERR (rl2))
@@ -1056,17 +1056,17 @@
#endif
-// CASE 312 - DOESN'T WORK YET.
-#if 0 || (TEST == 4)
- rl1 = decompress_mapping_pairs (&vol, buf3, NULL);
+// CASE 231 - DOESN'T WORK YET.
+#if 0 || (TESTF == 4)
+ rl1 = decompress_mapping_pairs (&vol, buf2, NULL);
if (IS_ERR (rl1))
return 1;
//printf ("rl1 %p\n", rl1);
-// rl_append: FAILED
- rl2 = decompress_mapping_pairs (&vol, buf1, rl1);
+// rl_replace: OK
+ rl2 = decompress_mapping_pairs (&vol, buf3, rl1);
if (IS_ERR (rl2))
return 1;
//printf ("rl2 %p\n", rl2);
-// not looked at
- rl3 = decompress_mapping_pairs (&vol, buf2, rl2);
+// rl_append: FAILED
+ rl3 = decompress_mapping_pairs (&vol, buf1, rl2);
if (IS_ERR (rl3))
return 1;
@@ -1074,17 +1074,17 @@
#endif
-// CASE 231 - DOESN'T WORK YET.
-#if 0 || (TEST == 5)
- rl1 = decompress_mapping_pairs (&vol, buf2, NULL);
+// CASE 312 - DOESN'T WORK YET.
+#if 0 || (TESTF == 5)
+ rl1 = decompress_mapping_pairs (&vol, buf3, NULL);
if (IS_ERR (rl1))
return 1;
//printf ("rl1 %p\n", rl1);
-// rl_replace: OK
- rl2 = decompress_mapping_pairs (&vol, buf3, rl1);
+// rl_append: FAILED
+ rl2 = decompress_mapping_pairs (&vol, buf1, rl1);
if (IS_ERR (rl2))
return 1;
//printf ("rl2 %p\n", rl2);
-// rl_append: FAILED
- rl3 = decompress_mapping_pairs (&vol, buf1, rl2);
+// not looked at
+ rl3 = decompress_mapping_pairs (&vol, buf2, rl2);
if (IS_ERR (rl3))
return 1;
@@ -1093,5 +1093,5 @@
// CASE 321 - DOESN'T WORK YET.
-#if 0 || (TEST == 6)
+#if 0 || (TESTF == 6)
rl1 = decompress_mapping_pairs (&vol, buf3, NULL);
if (IS_ERR (rl1))
|
