[Linux-NTFS-cvs] CVS: ntfs-misc/rl_test rl.c,1.2,1.3

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfs-misc/rl_test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25561

Modified Files:
	rl.c 
Log Message:
Fix the problem case and add tons more pure test cases.


Index: rl.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-misc/rl_test/rl.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- rl.c	7 Sep 2005 23:25:34 -0000	1.2
+++ rl.c	7 Sep 2005 23:46:06 -0000	1.3
@@ -568,7 +568,7 @@ runlist_element *ntfs_merge_runlists(run
 		  (srl[send - 1].vcn + srl[send - 1].length)));
 
 	/* Or we'll lose an end marker */
-	if (start && finish && (drl[dins].length == 0))
+	if (finish && !drl[dins].length)
 		ss++;
 	if (marker && (drl[dins].vcn + drl[dins].length > srl[send - 1].vcn))
 		finish = FALSE;
@@ -1002,6 +1002,26 @@ void pure (char *contig, char *multi)
 	static runlist_element file4[] = {
 		{    0,   -3,   0 }	/* NOENT */
 	};
+	static runlist_element file5[] = {
+		{    0,   -1, 100 },	/* HOLE */
+		{  100, 1100, 100 },	/* DATA */
+		{  200,   -1, 100 },	/* HOLE */
+		{  300, 1300, 100 },	/* DATA */
+		{  400,   -1, 100 },	/* HOLE */
+		{  500,   -2,   0 }	/* NOTMAPPED */
+	};
+	static runlist_element file6[] = {
+		{    0, 1000, 100 },	/* DATA */
+		{  100,   -1, 100 },	/* HOLE */
+		{  200,   -2,   0 }	/* NOTMAPPED */
+	};
+	static runlist_element file7[] = {
+		{    0, 1000, 100 },	/* DATA */
+		{  100,   -2,   0 }	/* NOTMAPPED */
+	};
+	static runlist_element file8[] = {
+		{    0,   -2,   0 }	/* NOTMAPPED */
+	};
 	BOOL c, m;
 
 	if (strcmp (contig, "contig") == 0)
@@ -1041,6 +1061,26 @@ void pure (char *contig, char *multi)
 	pure_test (18, c, m, 140,  40, file3, sizeof (file3));
 	pure_test (19, c, m,   0,  40, file4, sizeof (file4));
 	pure_test (20, c, m,  40,  40, file4, sizeof (file4));
+	pure_test (21, c, m,   0,  40, file1, sizeof (file5));
+	pure_test (22, c, m,  40,  40, file1, sizeof (file5));
+	pure_test (23, c, m,  60,  40, file1, sizeof (file5));
+	pure_test (24, c, m,   0, 100, file1, sizeof (file5));
+	pure_test (25, c, m, 200,  40, file1, sizeof (file5));
+	pure_test (26, c, m, 240,  40, file1, sizeof (file5));
+	pure_test (27, c, m, 260,  40, file1, sizeof (file5));
+	pure_test (28, c, m, 200, 100, file1, sizeof (file5));
+	pure_test (29, c, m, 400,  40, file1, sizeof (file5));
+	pure_test (30, c, m, 440,  40, file1, sizeof (file5));
+	pure_test (31, c, m, 460,  40, file1, sizeof (file5));
+	pure_test (32, c, m, 400, 100, file1, sizeof (file5));
+	pure_test (33, c, m, 160, 100, file2, sizeof (file6));
+	pure_test (34, c, m, 100, 140, file2, sizeof (file6));
+	pure_test (35, c, m, 200,  40, file2, sizeof (file6));
+	pure_test (36, c, m, 240,  40, file2, sizeof (file6));
+	pure_test (37, c, m, 100,  40, file3, sizeof (file7));
+	pure_test (38, c, m, 140,  40, file3, sizeof (file7));
+	pure_test (39, c, m,   0,  40, file4, sizeof (file8));
+	pure_test (40, c, m,  40,  40, file4, sizeof (file8));
 }
 
 /**