make(1) tests: Remove remaining CVS IDs from the tests to make them r…

…un again.
DragonFlyBSD · Jan 31, 2009 · e368a15 · e368a15
1 parent 3bf8a2e
commit e368a15
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 22 deletions.
diff --git a/usr.bin/make/tests/basic/t3/expected.status b/usr.bin/make/tests/basic/t3/expected.status
@@ -1,2 +1 @@
-$DragonFly: src/usr.bin/make/tests/basic/t3/expected.status,v 1.1 2005/02/26 10:43:09 okumoto Exp $
 2
diff --git a/usr.bin/make/tests/basic/t3/expected.stderr b/usr.bin/make/tests/basic/t3/expected.stderr
@@ -1,2 +1 @@
-$DragonFly: src/usr.bin/make/tests/basic/t3/expected.stderr,v 1.1 2005/02/26 10:43:09 okumoto Exp $
 make: no target to make.
diff --git a/usr.bin/make/tests/basic/t3/expected.stdout b/usr.bin/make/tests/basic/t3/expected.stdout
@@ -1 +0,0 @@
-$DragonFly: src/usr.bin/make/tests/basic/t3/expected.stdout,v 1.1 2005/02/26 10:43:09 okumoto Exp $

diff --git a/usr.bin/make/tests/common.sh b/usr.bin/make/tests/common.sh
@@ -21,9 +21,6 @@ print_usage()
 
 #
 # Check if the test result is the same as the expected result.
-# First remove the RCS Id tag, check for differences in the files.
-# We need this function because the CVS repository will not allow
-# us to check in a file without a DragonFly RCS Id tag.
 #
 # $1	Input file
 #
@@ -34,10 +31,7 @@ hack_cmp()
 	RESULT=$WORK_BASE/$1
 
 	if [ -f $EXPECTED ]; then
-		cat $EXPECTED |\
-			sed -e '1d' |\
-			diff -q - $RESULT \
-			1> /dev/null 2> /dev/null
+		diff -q $EXPECTED $RESULT 1> /dev/null 2> /dev/null
 		return $?
 	else
 		return 1	# FAIL
@@ -46,9 +40,6 @@ hack_cmp()
 
 #
 # Check if the test result is the same as the expected result.
-# First remove the RCS Id tag, print the differences in the files.
-# We need this function because the CVS repository will not allow
-# us to check in a file without a DragonFly RCS Id tag.
 #
 # $1	Input file
 #
@@ -60,9 +51,7 @@ hack_diff()
 
 	echo diff $EXPECTED $RESULT
 	if [ -f $EXPECTED ]; then
-		cat $EXPECTED |\
-			sed -e '1d' |\
-			diff - $RESULT
+		diff $EXPECTED $RESULT
 		return $?
 	else
 		return 1	# FAIL

diff --git a/usr.bin/make/tests/variables/t1/expected.status b/usr.bin/make/tests/variables/t1/expected.status
@@ -1,2 +1 @@
-$DragonFly: src/usr.bin/make/tests/variables/t1/expected.status,v 1.1 2005/02/25 08:53:14 okumoto Exp $
 0
diff --git a/usr.bin/make/tests/variables/t1/expected.stderr b/usr.bin/make/tests/variables/t1/expected.stderr
@@ -1 +0,0 @@
-$DragonFly: src/usr.bin/make/tests/variables/t1/expected.stderr,v 1.1 2005/02/25 08:53:14 okumoto Exp $

diff --git a/usr.bin/make/tests/variables/t1/expected.stdout b/usr.bin/make/tests/variables/t1/expected.stdout
@@ -1,4 +1,3 @@
-$DragonFly: src/usr.bin/make/tests/variables/t1/expected.stdout,v 1.2 2005/02/26 11:23:54 okumoto Exp $
 all files: main.c globals.h  util.c util.h  map.c map.h  parser.y lexer.l  cmdman.1 format.5
 cfiles: main.c util.c map.c
 hfiles: globals.h util.h map.h

diff --git a/usr.bin/make/tests/variables/t2/expected.status b/usr.bin/make/tests/variables/t2/expected.status
@@ -1,2 +1 @@
-$DragonFly: src/usr.bin/make/tests/variables/t2/expected.status,v 1.1 2005/03/02 10:58:58 okumoto Exp $
 0
diff --git a/usr.bin/make/tests/variables/t2/expected.stderr b/usr.bin/make/tests/variables/t2/expected.stderr
@@ -1 +0,0 @@
-$DragonFly: src/usr.bin/make/tests/variables/t2/expected.stderr,v 1.1 2005/03/02 10:58:59 okumoto Exp $

diff --git a/usr.bin/make/tests/variables/t2/expected.stdout b/usr.bin/make/tests/variables/t2/expected.stdout
@@ -1,4 +1,3 @@
-$DragonFly: src/usr.bin/make/tests/variables/t2/expected.stdout,v 1.3 2005/03/03 19:13:00 okumoto Exp $
 Old: main.c globals.h  util.c util.h  map.c map.h  parser.y lexer.l  cmdman.1 format.5
 New: main.c globals.h util.c util.h Map.c Map.h parser.y lexer.l cmdman.1 format.5
 New: main_wrapper.c globals.h util.c util.h map.c map.h parser.y lexer.l cmdman.1 format.5