Rationalize grep behavior

Add tests for the combination of output channels that work Fix issue #31 Fix issue #95
dspinellis · Sep 27, 2017 · 194d3f4 · 194d3f4
1 parent 0f9e80e
commit 194d3f4
Show file tree

Hide file tree

Showing 129 changed files with 334 additions and 2 deletions.
diff --git a/core-tools/src/negotiate.c b/core-tools/src/negotiate.c
@@ -978,7 +978,7 @@ prepare_solution(void)
 		current_connections->edges_outgoing = NULL;
         	int *n_edges_incoming = &current_connections->n_edges_incoming;
         	int *n_edges_outgoing = &current_connections->n_edges_outgoing;
-		DPRINTF(4, "%s(): Node %s, pid: %d, connections in: %d, connections out: %d.",
+		DPRINTF(3, "%s(): Node %s, pid: %d, connections in: %d, connections out: %d.",
 				__func__, chosen_mb->node_array[i].name,
 				chosen_mb->node_array[i].pid,
 				*n_edges_incoming, *n_edges_outgoing);

diff --git a/simple-shell/grep-L-c-l-matching-lines-nomatch.success b/simple-shell/grep-L-c-l-matching-lines-nomatch.success
@@ -0,0 +1 @@
+(standard input)	0		
diff --git a/simple-shell/grep-L-c-l-matching-lines.success b/simple-shell/grep-L-c-l-matching-lines.success
@@ -0,0 +1 @@
+	1	(standard input)	hi
diff --git a/simple-shell/grep-L-c-l-nomatch.success b/simple-shell/grep-L-c-l-nomatch.success
@@ -0,0 +1 @@
+(standard input)	0	
diff --git a/simple-shell/grep-L-c-l.success b/simple-shell/grep-L-c-l.success
@@ -0,0 +1 @@
+	1	(standard input)
diff --git a/simple-shell/grep-L-c-matching-lines-l-nomatch.success b/simple-shell/grep-L-c-matching-lines-l-nomatch.success
@@ -0,0 +1 @@
+(standard input)	0		
diff --git a/simple-shell/grep-L-c-matching-lines-l.success b/simple-shell/grep-L-c-matching-lines-l.success
@@ -0,0 +1 @@
+	1	hi	(standard input)
diff --git a/simple-shell/grep-L-c-matching-lines-nomatch.success b/simple-shell/grep-L-c-matching-lines-nomatch.success
@@ -0,0 +1 @@
+(standard input)	0	
diff --git a/simple-shell/grep-L-c-matching-lines.success b/simple-shell/grep-L-c-matching-lines.success
@@ -0,0 +1 @@
+	1	hi
diff --git a/simple-shell/grep-L-c-nomatch.success b/simple-shell/grep-L-c-nomatch.success
@@ -0,0 +1,2 @@
+(standard input)
+0
diff --git a/simple-shell/grep-L-c.success b/simple-shell/grep-L-c.success
@@ -0,0 +1 @@
+1
diff --git a/simple-shell/grep-L-cat-nomatch.success b/simple-shell/grep-L-cat-nomatch.success
@@ -0,0 +1 @@
+(standard input)
diff --git a/simple-shell/grep-L-cat.success b/simple-shell/grep-L-cat.success
diff --git a/simple-shell/grep-L-l-c-matching-lines-nomatch.success b/simple-shell/grep-L-l-c-matching-lines-nomatch.success
@@ -0,0 +1 @@
+(standard input)		0	
diff --git a/simple-shell/grep-L-l-c-matching-lines.success b/simple-shell/grep-L-l-c-matching-lines.success
@@ -0,0 +1 @@
+	(standard input)	1	hi
diff --git a/simple-shell/grep-L-l-c-nomatch.success b/simple-shell/grep-L-l-c-nomatch.success
@@ -0,0 +1 @@
+(standard input)		0
diff --git a/simple-shell/grep-L-l-c.success b/simple-shell/grep-L-l-c.success
@@ -0,0 +1 @@
+	(standard input)	1
diff --git a/simple-shell/grep-L-l-matching-lines-c-nomatch.success b/simple-shell/grep-L-l-matching-lines-c-nomatch.success
@@ -0,0 +1 @@
+(standard input)			0
diff --git a/simple-shell/grep-L-l-matching-lines-c.success b/simple-shell/grep-L-l-matching-lines-c.success
@@ -0,0 +1 @@
+	(standard input)	hi	1
diff --git a/simple-shell/grep-L-l-matching-lines-nomatch.success b/simple-shell/grep-L-l-matching-lines-nomatch.success
@@ -0,0 +1 @@
+(standard input)		
diff --git a/simple-shell/grep-L-l-matching-lines.success b/simple-shell/grep-L-l-matching-lines.success
@@ -0,0 +1 @@
+	(standard input)	hi
diff --git a/simple-shell/grep-L-l-nomatch.success b/simple-shell/grep-L-l-nomatch.success
@@ -0,0 +1 @@
+(standard input)	
diff --git a/simple-shell/grep-L-l.success b/simple-shell/grep-L-l.success
@@ -0,0 +1 @@
+	(standard input)
diff --git a/simple-shell/grep-L-matching-lines-c-l-nomatch.success b/simple-shell/grep-L-matching-lines-c-l-nomatch.success
@@ -0,0 +1 @@
+(standard input)		0	
diff --git a/simple-shell/grep-L-matching-lines-c-l.success b/simple-shell/grep-L-matching-lines-c-l.success
@@ -0,0 +1 @@
+	hi	1	(standard input)
diff --git a/simple-shell/grep-L-matching-lines-c-nomatch.success b/simple-shell/grep-L-matching-lines-c-nomatch.success
@@ -0,0 +1 @@
+(standard input)		0
diff --git a/simple-shell/grep-L-matching-lines-c.success b/simple-shell/grep-L-matching-lines-c.success
@@ -0,0 +1 @@
+	hi	1
diff --git a/simple-shell/grep-L-matching-lines-l-c-nomatch.success b/simple-shell/grep-L-matching-lines-l-c-nomatch.success
@@ -0,0 +1 @@
+(standard input)			0
diff --git a/simple-shell/grep-L-matching-lines-l-c.success b/simple-shell/grep-L-matching-lines-l-c.success
@@ -0,0 +1 @@
+	hi	(standard input)	1
diff --git a/simple-shell/grep-L-matching-lines-l-nomatch.success b/simple-shell/grep-L-matching-lines-l-nomatch.success
@@ -0,0 +1 @@
+(standard input)		
diff --git a/simple-shell/grep-L-matching-lines-l.success b/simple-shell/grep-L-matching-lines-l.success
@@ -0,0 +1 @@
+	hi	(standard input)
diff --git a/simple-shell/grep-L-matching-lines-nomatch.success b/simple-shell/grep-L-matching-lines-nomatch.success
@@ -0,0 +1 @@
+(standard input)	
diff --git a/simple-shell/grep-L-matching-lines.success b/simple-shell/grep-L-matching-lines.success
@@ -0,0 +1 @@
+	hi
diff --git a/simple-shell/grep-L-nomatch.success b/simple-shell/grep-L-nomatch.success
@@ -0,0 +1 @@
+(standard input)
diff --git a/simple-shell/grep-L.success b/simple-shell/grep-L.success
diff --git a/simple-shell/grep-c-L-l-matching-lines-nomatch.success b/simple-shell/grep-c-L-l-matching-lines-nomatch.success
@@ -0,0 +1 @@
+0	(standard input)		
diff --git a/simple-shell/grep-c-L-l-matching-lines.success b/simple-shell/grep-c-L-l-matching-lines.success
@@ -0,0 +1 @@
+1		(standard input)	hi
diff --git a/simple-shell/grep-c-L-l-nomatch.success b/simple-shell/grep-c-L-l-nomatch.success
@@ -0,0 +1 @@
+0	(standard input)	
diff --git a/simple-shell/grep-c-L-l.success b/simple-shell/grep-c-L-l.success
@@ -0,0 +1 @@
+1		(standard input)
diff --git a/simple-shell/grep-c-L-matching-lines-l-nomatch.success b/simple-shell/grep-c-L-matching-lines-l-nomatch.success
@@ -0,0 +1 @@
+0	(standard input)		
diff --git a/simple-shell/grep-c-L-matching-lines-l.success b/simple-shell/grep-c-L-matching-lines-l.success
@@ -0,0 +1 @@
+1		hi	(standard input)
diff --git a/simple-shell/grep-c-L-matching-lines-nomatch.success b/simple-shell/grep-c-L-matching-lines-nomatch.success
@@ -0,0 +1 @@
+0	(standard input)	
diff --git a/simple-shell/grep-c-L-matching-lines.success b/simple-shell/grep-c-L-matching-lines.success
@@ -0,0 +1 @@
+1		hi
diff --git a/simple-shell/grep-c-L-nomatch.success b/simple-shell/grep-c-L-nomatch.success
@@ -0,0 +1 @@
+0	(standard input)
diff --git a/simple-shell/grep-c-L.success b/simple-shell/grep-c-L.success
@@ -0,0 +1 @@
+1	
diff --git a/simple-shell/grep-c-cat.success b/simple-shell/grep-c-cat.success
@@ -0,0 +1 @@
+1
diff --git a/simple-shell/grep-c-l-L-matching-lines-nomatch.success b/simple-shell/grep-c-l-L-matching-lines-nomatch.success
@@ -0,0 +1 @@
+0		(standard input)	
diff --git a/simple-shell/grep-c-l-L-matching-lines.success b/simple-shell/grep-c-l-L-matching-lines.success
@@ -0,0 +1 @@
+1	(standard input)		hi
diff --git a/simple-shell/grep-c-l-L-nomatch.success b/simple-shell/grep-c-l-L-nomatch.success
@@ -0,0 +1 @@
+0		(standard input)
diff --git a/simple-shell/grep-c-l-L.success b/simple-shell/grep-c-l-L.success
@@ -0,0 +1 @@
+1	(standard input)	
diff --git a/simple-shell/grep-c-l-matching-lines-L-nomatch.success b/simple-shell/grep-c-l-matching-lines-L-nomatch.success
@@ -0,0 +1 @@
+0			(standard input)
diff --git a/simple-shell/grep-c-l-matching-lines-L.success b/simple-shell/grep-c-l-matching-lines-L.success
@@ -0,0 +1 @@
+1	(standard input)	hi	
diff --git a/simple-shell/grep-c-l-matching-lines.success b/simple-shell/grep-c-l-matching-lines.success
@@ -0,0 +1 @@
+1	(standard input)	hi
diff --git a/simple-shell/grep-c-l.success b/simple-shell/grep-c-l.success
@@ -0,0 +1,2 @@
+1
+(standard input)
diff --git a/simple-shell/grep-c-matching-lines-L-l-nomatch.success b/simple-shell/grep-c-matching-lines-L-l-nomatch.success
@@ -0,0 +1 @@
+0		(standard input)	
diff --git a/simple-shell/grep-c-matching-lines-L-l.success b/simple-shell/grep-c-matching-lines-L-l.success
@@ -0,0 +1 @@
+1	hi		(standard input)
diff --git a/simple-shell/grep-c-matching-lines-L-nomatch.success b/simple-shell/grep-c-matching-lines-L-nomatch.success
@@ -0,0 +1 @@
+0		(standard input)
diff --git a/simple-shell/grep-c-matching-lines-L.success b/simple-shell/grep-c-matching-lines-L.success
@@ -0,0 +1 @@
+1	hi	
diff --git a/simple-shell/grep-c-matching-lines-l-L-nomatch.success b/simple-shell/grep-c-matching-lines-l-L-nomatch.success
@@ -0,0 +1 @@
+0			(standard input)
diff --git a/simple-shell/grep-c-matching-lines-l-L.success b/simple-shell/grep-c-matching-lines-l-L.success
@@ -0,0 +1 @@
+1	hi	(standard input)	
diff --git a/simple-shell/grep-c-matching-lines-l.success b/simple-shell/grep-c-matching-lines-l.success
@@ -0,0 +1 @@
+1	hi	(standard input)
diff --git a/simple-shell/grep-c-matching-lines.success b/simple-shell/grep-c-matching-lines.success
@@ -0,0 +1,2 @@
+1
+hi
diff --git a/simple-shell/grep-c.success b/simple-shell/grep-c.success
@@ -0,0 +1 @@
+1
diff --git a/simple-shell/grep-f-cat.success b/simple-shell/grep-f-cat.success
@@ -0,0 +1 @@
+hi
diff --git a/simple-shell/grep-f.success b/simple-shell/grep-f.success
@@ -0,0 +1 @@
+hi
diff --git a/simple-shell/grep-l-L-c-matching-lines-nomatch.success b/simple-shell/grep-l-L-c-matching-lines-nomatch.success
@@ -0,0 +1 @@
+	(standard input)	0	
diff --git a/simple-shell/grep-l-L-c-matching-lines.success b/simple-shell/grep-l-L-c-matching-lines.success
@@ -0,0 +1 @@
+(standard input)		1	hi
diff --git a/simple-shell/grep-l-L-c-nomatch.success b/simple-shell/grep-l-L-c-nomatch.success
@@ -0,0 +1 @@
+	(standard input)	0
diff --git a/simple-shell/grep-l-L-c.success b/simple-shell/grep-l-L-c.success
@@ -0,0 +1 @@
+(standard input)		1
diff --git a/simple-shell/grep-l-L-matching-lines-c-nomatch.success b/simple-shell/grep-l-L-matching-lines-c-nomatch.success
@@ -0,0 +1 @@
+	(standard input)		0
diff --git a/simple-shell/grep-l-L-matching-lines-c.success b/simple-shell/grep-l-L-matching-lines-c.success
@@ -0,0 +1 @@
+(standard input)		hi	1
diff --git a/simple-shell/grep-l-L-matching-lines-nomatch.success b/simple-shell/grep-l-L-matching-lines-nomatch.success
@@ -0,0 +1 @@
+	(standard input)	
diff --git a/simple-shell/grep-l-L-matching-lines.success b/simple-shell/grep-l-L-matching-lines.success
@@ -0,0 +1 @@
+(standard input)		hi
diff --git a/simple-shell/grep-l-L-nomatch.success b/simple-shell/grep-l-L-nomatch.success
@@ -0,0 +1 @@
+	(standard input)
diff --git a/simple-shell/grep-l-L.success b/simple-shell/grep-l-L.success
@@ -0,0 +1 @@
+(standard input)	
diff --git a/simple-shell/grep-l-c-L-matching-lines-nomatch.success b/simple-shell/grep-l-c-L-matching-lines-nomatch.success
@@ -0,0 +1 @@
+	0	(standard input)	
diff --git a/simple-shell/grep-l-c-L-matching-lines.success b/simple-shell/grep-l-c-L-matching-lines.success
@@ -0,0 +1 @@
+(standard input)	1		hi
diff --git a/simple-shell/grep-l-c-L-nomatch.success b/simple-shell/grep-l-c-L-nomatch.success
@@ -0,0 +1 @@
+	0	(standard input)
diff --git a/simple-shell/grep-l-c-L.success b/simple-shell/grep-l-c-L.success
@@ -0,0 +1 @@
+(standard input)	1	
diff --git a/simple-shell/grep-l-c-matching-lines-L-nomatch.success b/simple-shell/grep-l-c-matching-lines-L-nomatch.success
@@ -0,0 +1 @@
+	0		(standard input)
diff --git a/simple-shell/grep-l-c-matching-lines-L.success b/simple-shell/grep-l-c-matching-lines-L.success
@@ -0,0 +1 @@
+(standard input)	1	hi	
diff --git a/simple-shell/grep-l-c-matching-lines.success b/simple-shell/grep-l-c-matching-lines.success
@@ -0,0 +1 @@
+(standard input)	1	hi
diff --git a/simple-shell/grep-l-c.success b/simple-shell/grep-l-c.success
@@ -0,0 +1,2 @@
+(standard input)
+1
diff --git a/simple-shell/grep-l-cat.success b/simple-shell/grep-l-cat.success
@@ -0,0 +1 @@
+(standard input)
diff --git a/simple-shell/grep-l-matching-lines-L-c-nomatch.success b/simple-shell/grep-l-matching-lines-L-c-nomatch.success
@@ -0,0 +1 @@
+		(standard input)	0
diff --git a/simple-shell/grep-l-matching-lines-L-c.success b/simple-shell/grep-l-matching-lines-L-c.success
@@ -0,0 +1 @@
+(standard input)	hi		1
diff --git a/simple-shell/grep-l-matching-lines-L-nomatch.success b/simple-shell/grep-l-matching-lines-L-nomatch.success
@@ -0,0 +1 @@
+		(standard input)
diff --git a/simple-shell/grep-l-matching-lines-L.success b/simple-shell/grep-l-matching-lines-L.success
@@ -0,0 +1 @@
+(standard input)	hi	
diff --git a/simple-shell/grep-l-matching-lines-c-L-nomatch.success b/simple-shell/grep-l-matching-lines-c-L-nomatch.success
@@ -0,0 +1 @@
+		0	(standard input)
diff --git a/simple-shell/grep-l-matching-lines-c-L.success b/simple-shell/grep-l-matching-lines-c-L.success
@@ -0,0 +1 @@
+(standard input)	hi	1	
diff --git a/simple-shell/grep-l-matching-lines-c.success b/simple-shell/grep-l-matching-lines-c.success
@@ -0,0 +1 @@
+(standard input)	hi	1
diff --git a/simple-shell/grep-l-matching-lines.success b/simple-shell/grep-l-matching-lines.success
@@ -0,0 +1,2 @@
+(standard input)
+hi
diff --git a/simple-shell/grep-l.success b/simple-shell/grep-l.success
@@ -0,0 +1 @@
+(standard input)
diff --git a/simple-shell/grep-matching-lines-L-c-l-nomatch.success b/simple-shell/grep-matching-lines-L-c-l-nomatch.success
@@ -0,0 +1 @@
+	(standard input)	0	
diff --git a/simple-shell/grep-matching-lines-L-c-l.success b/simple-shell/grep-matching-lines-L-c-l.success
@@ -0,0 +1 @@
+hi		1	(standard input)
diff --git a/simple-shell/grep-matching-lines-L-c-nomatch.success b/simple-shell/grep-matching-lines-L-c-nomatch.success
@@ -0,0 +1 @@
+	(standard input)	0
diff --git a/simple-shell/grep-matching-lines-L-c.success b/simple-shell/grep-matching-lines-L-c.success
@@ -0,0 +1 @@
+hi		1
diff --git a/simple-shell/grep-matching-lines-L-l-c-nomatch.success b/simple-shell/grep-matching-lines-L-l-c-nomatch.success
@@ -0,0 +1 @@
+	(standard input)		0
diff --git a/simple-shell/grep-matching-lines-L-l-c.success b/simple-shell/grep-matching-lines-L-l-c.success
@@ -0,0 +1 @@
+hi		(standard input)	1
diff --git a/simple-shell/grep-matching-lines-L-l-nomatch.success b/simple-shell/grep-matching-lines-L-l-nomatch.success
@@ -0,0 +1 @@
+	(standard input)	
diff --git a/simple-shell/grep-matching-lines-L-l.success b/simple-shell/grep-matching-lines-L-l.success
@@ -0,0 +1 @@
+hi		(standard input)
diff --git a/simple-shell/grep-matching-lines-L-nomatch.success b/simple-shell/grep-matching-lines-L-nomatch.success
@@ -0,0 +1 @@
+	(standard input)
diff --git a/simple-shell/grep-matching-lines-L.success b/simple-shell/grep-matching-lines-L.success
@@ -0,0 +1 @@
+hi
diff --git a/simple-shell/grep-matching-lines-c-L-l-nomatch.success b/simple-shell/grep-matching-lines-c-L-l-nomatch.success
@@ -0,0 +1 @@
+	0	(standard input)	
diff --git a/simple-shell/grep-matching-lines-c-L-l.success b/simple-shell/grep-matching-lines-c-L-l.success
@@ -0,0 +1 @@
+hi	1		(standard input)
diff --git a/simple-shell/grep-matching-lines-c-L-nomatch.success b/simple-shell/grep-matching-lines-c-L-nomatch.success
@@ -0,0 +1 @@
+	0	(standard input)
diff --git a/simple-shell/grep-matching-lines-c-L.success b/simple-shell/grep-matching-lines-c-L.success
@@ -0,0 +1 @@
+hi	1	
diff --git a/simple-shell/grep-matching-lines-c-l-L-nomatch.success b/simple-shell/grep-matching-lines-c-l-L-nomatch.success
@@ -0,0 +1 @@
+	0		(standard input)
diff --git a/simple-shell/grep-matching-lines-c-l-L.success b/simple-shell/grep-matching-lines-c-l-L.success
@@ -0,0 +1 @@
+hi	1	(standard input)	
diff --git a/simple-shell/grep-matching-lines-c-l.success b/simple-shell/grep-matching-lines-c-l.success
@@ -0,0 +1 @@
+hi	1	(standard input)
diff --git a/simple-shell/grep-matching-lines-c.success b/simple-shell/grep-matching-lines-c.success
@@ -0,0 +1,2 @@
+hi
+1
diff --git a/simple-shell/grep-matching-lines-cat.success b/simple-shell/grep-matching-lines-cat.success
@@ -0,0 +1 @@
+hi
diff --git a/simple-shell/grep-matching-lines-l-L-c-nomatch.success b/simple-shell/grep-matching-lines-l-L-c-nomatch.success
@@ -0,0 +1 @@
+		(standard input)	0
diff --git a/simple-shell/grep-matching-lines-l-L-c.success b/simple-shell/grep-matching-lines-l-L-c.success
@@ -0,0 +1 @@
+hi	(standard input)		1
diff --git a/simple-shell/grep-matching-lines-l-L-nomatch.success b/simple-shell/grep-matching-lines-l-L-nomatch.success
@@ -0,0 +1 @@
+		(standard input)
diff --git a/simple-shell/grep-matching-lines-l-L.success b/simple-shell/grep-matching-lines-l-L.success
@@ -0,0 +1 @@
+hi	(standard input)	
diff --git a/simple-shell/grep-matching-lines-l-c-L-nomatch.success b/simple-shell/grep-matching-lines-l-c-L-nomatch.success
@@ -0,0 +1 @@
+		0	(standard input)
diff --git a/simple-shell/grep-matching-lines-l-c-L.success b/simple-shell/grep-matching-lines-l-c-L.success
@@ -0,0 +1 @@
+hi	(standard input)	1	
diff --git a/simple-shell/grep-matching-lines-l-c.success b/simple-shell/grep-matching-lines-l-c.success
@@ -0,0 +1 @@
+hi	(standard input)	1
diff --git a/simple-shell/grep-matching-lines-l.success b/simple-shell/grep-matching-lines-l.success
@@ -0,0 +1,2 @@
+hi
+(standard input)
diff --git a/simple-shell/grep-matching-lines.success b/simple-shell/grep-matching-lines.success
@@ -0,0 +1 @@
+hi
diff --git a/simple-shell/grep-noargs-cat.success b/simple-shell/grep-noargs-cat.success
@@ -0,0 +1 @@
+hi
diff --git a/simple-shell/grep-noargs.success b/simple-shell/grep-noargs.success
@@ -0,0 +1 @@
+hi
diff --git a/simple-shell/grep-o-cat.success b/simple-shell/grep-o-cat.success
@@ -0,0 +1 @@
+hi
diff --git a/simple-shell/grep-o.success b/simple-shell/grep-o.success
@@ -0,0 +1 @@
+hi
diff --git a/simple-shell/grep-v-cat.success b/simple-shell/grep-v-cat.success
@@ -0,0 +1 @@
+hi
diff --git a/simple-shell/grep-v.success b/simple-shell/grep-v.success
@@ -0,0 +1 @@
+hi
diff --git a/unix-tools/grep b/unix-tools/grep