t00{1,6}0: remove some useless cats

chriscool · chriscool · commit e5031788fd08 · 2015-10-16T21:54:47.000+02:00
License: MIT
Signed-off-by: Christian Couder &lt;chriscool@tuxfamily.org&gt;
diff --git a/test/sharness/t0010-basic-commands.sh b/test/sharness/t0010-basic-commands.sh
@@ -17,7 +17,7 @@ test_expect_success "ipfs version succeeds" '
 '
 
 test_expect_success "ipfs version output looks good" '
-	cat version.txt | egrep "^ipfs version [0-9]+\.[0-9]+\.[0-9]" >/dev/null ||
+	egrep "^ipfs version [0-9]+\.[0-9]+\.[0-9]" version.txt >/dev/null ||
 	test_fsh cat version.txt
 '
 
@@ -26,8 +26,8 @@ test_expect_success "ipfs help succeeds" '
 '
 
 test_expect_success "ipfs help output looks good" '
-	cat help.txt | egrep -i "^Usage:" >/dev/null &&
-	cat help.txt | egrep "ipfs .* <command>" >/dev/null ||
+	egrep -i "^Usage:" help.txt >/dev/null &&
+	egrep "ipfs .* <command>" help.txt >/dev/null ||
 	test_fsh cat help.txt
 '
 
diff --git a/test/sharness/t0060-daemon.sh b/test/sharness/t0060-daemon.sh
@@ -60,7 +60,7 @@ test_expect_success "ipfs daemon output looks good" '
   echo "peer identity: $PEERID" >>expected_daemon &&
   echo "to get started, enter:" >>expected_daemon &&
   printf "\\n\\t$STARTFILE\\n\\n" >>expected_daemon &&
-  cat local_addrs | sed "s/^/Swarm listening on /" >>expected_daemon &&
+  sed "s/^/Swarm listening on /" local_addrs >>expected_daemon &&
   echo "API server listening on /ip4/127.0.0.1/tcp/5001" >>expected_daemon &&
   echo "Gateway (readonly) server listening on /ip4/127.0.0.1/tcp/8080" >>expected_daemon &&
   echo "Daemon is ready" >>expected_daemon &&
@@ -82,7 +82,7 @@ test_expect_success "ipfs version succeeds" '
 '
 
 test_expect_success "ipfs version output looks good" '
-	cat version.txt | egrep "^ipfs version [0-9]+\.[0-9]+\.[0-9]" >/dev/null ||
+	egrep "^ipfs version [0-9]+\.[0-9]+\.[0-9]" version.txt >/dev/null ||
 	test_fsh cat version.txt
 '
 
@@ -91,8 +91,8 @@ test_expect_success "ipfs help succeeds" '
 '
 
 test_expect_success "ipfs help output looks good" '
-	cat help.txt | egrep -i "^Usage:" >/dev/null &&
-	cat help.txt | egrep "ipfs .* <command>" >/dev/null ||
+	egrep -i "^Usage:" help.txt >/dev/null &&
+	egrep "ipfs .* <command>" help.txt >/dev/null ||
 	test_fsh cat help.txt
 '
 

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ test_expect_success "ipfs version succeeds" '`
`17`	`17`	`'`
`18`	`18`
`19`	`19`	`test_expect_success "ipfs version output looks good" '`
`20`		`- cat version.txt \| egrep "^ipfs version [0-9]+\.[0-9]+\.[0-9]" >/dev/null \|\|`
	`20`	`+ egrep "^ipfs version [0-9]+\.[0-9]+\.[0-9]" version.txt >/dev/null \|\|`
`21`	`21`	`test_fsh cat version.txt`
`22`	`22`	`'`
`23`	`23`
`@@ -26,8 +26,8 @@ test_expect_success "ipfs help succeeds" '`
`26`	`26`	`'`
`27`	`27`
`28`	`28`	`test_expect_success "ipfs help output looks good" '`
`29`		`- cat help.txt \| egrep -i "^Usage:" >/dev/null &&`
`30`		`- cat help.txt \| egrep "ipfs .* <command>" >/dev/null \|\|`
	`29`	`+ egrep -i "^Usage:" help.txt >/dev/null &&`
	`30`	`+ egrep "ipfs .* <command>" help.txt >/dev/null \|\|`
`31`	`31`	`test_fsh cat help.txt`
`32`	`32`	`'`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ test_expect_success "ipfs daemon output looks good" '`
`60`	`60`	`echo "peer identity: $PEERID" >>expected_daemon &&`
`61`	`61`	`echo "to get started, enter:" >>expected_daemon &&`
`62`	`62`	`printf "\\n\\t$STARTFILE\\n\\n" >>expected_daemon &&`
`63`		`- cat local_addrs \| sed "s/^/Swarm listening on /" >>expected_daemon &&`
	`63`	`+ sed "s/^/Swarm listening on /" local_addrs >>expected_daemon &&`
`64`	`64`	`echo "API server listening on /ip4/127.0.0.1/tcp/5001" >>expected_daemon &&`
`65`	`65`	`echo "Gateway (readonly) server listening on /ip4/127.0.0.1/tcp/8080" >>expected_daemon &&`
`66`	`66`	`echo "Daemon is ready" >>expected_daemon &&`
`@@ -82,7 +82,7 @@ test_expect_success "ipfs version succeeds" '`
`82`	`82`	`'`
`83`	`83`
`84`	`84`	`test_expect_success "ipfs version output looks good" '`
`85`		`- cat version.txt \| egrep "^ipfs version [0-9]+\.[0-9]+\.[0-9]" >/dev/null \|\|`
	`85`	`+ egrep "^ipfs version [0-9]+\.[0-9]+\.[0-9]" version.txt >/dev/null \|\|`
`86`	`86`	`test_fsh cat version.txt`
`87`	`87`	`'`
`88`	`88`
`@@ -91,8 +91,8 @@ test_expect_success "ipfs help succeeds" '`
`91`	`91`	`'`
`92`	`92`
`93`	`93`	`test_expect_success "ipfs help output looks good" '`
`94`		`- cat help.txt \| egrep -i "^Usage:" >/dev/null &&`
`95`		`- cat help.txt \| egrep "ipfs .* <command>" >/dev/null \|\|`
	`94`	`+ egrep -i "^Usage:" help.txt >/dev/null &&`
	`95`	`+ egrep "ipfs .* <command>" help.txt >/dev/null \|\|`
`96`	`96`	`test_fsh cat help.txt`
`97`	`97`	`'`
`98`	`98`