make(1) tests: Messing with the CVS ID is no longer needed.

diff --git a/usr.bin/make/tests/basic/t0/expected.status b/usr.bin/make/tests/basic/t0/expected.status
index 8550a1f..0cfbf08 100644 (file)
--- a/usr.bin/make/tests/basic/t0/expected.status
+++ b/usr.bin/make/tests/basic/t0/expected.status
@@ -1,2 +1 @@
-$DragonFly$
 2

diff --git a/usr.bin/make/tests/basic/t0/expected.stderr b/usr.bin/make/tests/basic/t0/expected.stderr
index 11866a3..90280c8 100644 (file)
--- a/usr.bin/make/tests/basic/t0/expected.stderr
+++ b/usr.bin/make/tests/basic/t0/expected.stderr
@@ -1,2 +1 @@
-$DragonFly$
 make: no target to make.

diff --git a/usr.bin/make/tests/basic/t0/expected.stdout b/usr.bin/make/tests/basic/t0/expected.stdout
index 4770cb7..e69de29 100644 (file)
--- a/usr.bin/make/tests/basic/t0/expected.stdout
+++ b/usr.bin/make/tests/basic/t0/expected.stdout
@@ -1 +0,0 @@
-$DragonFly$

diff --git a/usr.bin/make/tests/basic/t1/expected.status b/usr.bin/make/tests/basic/t1/expected.status
index 9943cc7..573541a 100644 (file)
--- a/usr.bin/make/tests/basic/t1/expected.status
+++ b/usr.bin/make/tests/basic/t1/expected.status
@@ -1,2 +1 @@
-$DragonFly$
 0

diff --git a/usr.bin/make/tests/basic/t1/expected.stderr b/usr.bin/make/tests/basic/t1/expected.stderr
index 4770cb7..e69de29 100644 (file)
--- a/usr.bin/make/tests/basic/t1/expected.stderr
+++ b/usr.bin/make/tests/basic/t1/expected.stderr
@@ -1 +0,0 @@
-$DragonFly$

diff --git a/usr.bin/make/tests/basic/t1/expected.stdout b/usr.bin/make/tests/basic/t1/expected.stdout
index 4770cb7..e69de29 100644 (file)
--- a/usr.bin/make/tests/basic/t1/expected.stdout
+++ b/usr.bin/make/tests/basic/t1/expected.stdout
@@ -1 +0,0 @@
-$DragonFly$

diff --git a/usr.bin/make/tests/basic/t2/expected.status b/usr.bin/make/tests/basic/t2/expected.status
index 9943cc7..573541a 100644 (file)
--- a/usr.bin/make/tests/basic/t2/expected.status
+++ b/usr.bin/make/tests/basic/t2/expected.status
@@ -1,2 +1 @@
-$DragonFly$
 0

diff --git a/usr.bin/make/tests/basic/t2/expected.stderr b/usr.bin/make/tests/basic/t2/expected.stderr
index 4770cb7..e69de29 100644 (file)
--- a/usr.bin/make/tests/basic/t2/expected.stderr
+++ b/usr.bin/make/tests/basic/t2/expected.stderr
@@ -1 +0,0 @@
-$DragonFly$

diff --git a/usr.bin/make/tests/basic/t2/expected.stdout b/usr.bin/make/tests/basic/t2/expected.stdout
index 9e7a05e..e618540 100644 (file)
--- a/usr.bin/make/tests/basic/t2/expected.stdout
+++ b/usr.bin/make/tests/basic/t2/expected.stdout
@@ -1,3 +1,2 @@
-$DragonFly$
 echo hello
 hello

diff --git a/usr.bin/make/tests/common.sh b/usr.bin/make/tests/common.sh
index 0b587a6..4c4389c 100644 (file)
--- a/usr.bin/make/tests/common.sh
+++ b/usr.bin/make/tests/common.sh
@@ -4,8 +4,6 @@
 #
 # $DragonFly: src/usr.bin/make/tests/common.sh,v 1.8 2005/03/02 10:55:37 okumoto Exp $
 
-IDTAG='$'DragonFly'$'
-
 #
 # Output usage messsage.
 #
@@ -204,35 +202,9 @@ eval_cmd()
                        ;;
                update)
                        sh $0 test
-                       #
-                       # Preserve the RCS id tag at top of file.
-                       # Create initial tag if the file didn't
-                       # exist.
-                       #
-                       if [ -f "."$SRC_BASE/expected.stdout ]; then
-                               head -n 1 "."$SRC_BASE/expected.stdout
-                       else
-                               echo $IDTAG
-                       fi > $WORK_BASE/expected.stdout
-
-                       if [ -f "."$SRC_BASE/expected.stderr ]; then
-                               head -n 1 "."$SRC_BASE/expected.stderr
-                       else
-                               echo $IDTAG
-                       fi > $WORK_BASE/expected.stderr
-
-                       if [ -f "."$SRC_BASE/expected.status ]; then
-                               head -n 1 "."$SRC_BASE/expected.status
-                       else
-                               echo $IDTAG
-                       fi > $WORK_BASE/expected.status
-
-                       cat $WORK_BASE/stdout >> $WORK_BASE/expected.stdout
-                       cat $WORK_BASE/stderr >> $WORK_BASE/expected.stderr
-                       cat $WORK_BASE/status >> $WORK_BASE/expected.status
-                       mv $WORK_BASE/expected.stdout "."$SRC_BASE/expected.stdout
-                       mv $WORK_BASE/expected.stderr "."$SRC_BASE/expected.stderr
-                       mv $WORK_BASE/expected.status "."$SRC_BASE/expected.status
+                       cp $WORK_BASE/stdout "."$SRC_BASE/expected.stdout
+                       cp $WORK_BASE/stderr "."$SRC_BASE/expected.stderr
+                       cp $WORK_BASE/status "."$SRC_BASE/expected.status
                        ;;
                *)
                        print_usage

diff --git a/usr.bin/make/tests/variables/t0/expected.status b/usr.bin/make/tests/variables/t0/expected.status
index 9943cc7..573541a 100644 (file)
--- a/usr.bin/make/tests/variables/t0/expected.status
+++ b/usr.bin/make/tests/variables/t0/expected.status
@@ -1,2 +1 @@
-$DragonFly$
 0

diff --git a/usr.bin/make/tests/variables/t0/expected.stderr b/usr.bin/make/tests/variables/t0/expected.stderr
index 4770cb7..e69de29 100644 (file)
--- a/usr.bin/make/tests/variables/t0/expected.stderr
+++ b/usr.bin/make/tests/variables/t0/expected.stderr
@@ -1 +0,0 @@
-$DragonFly$

diff --git a/usr.bin/make/tests/variables/t0/expected.stdout b/usr.bin/make/tests/variables/t0/expected.stdout
index 4d98055..dfe03b8 100644 (file)
--- a/usr.bin/make/tests/variables/t0/expected.stdout
+++ b/usr.bin/make/tests/variables/t0/expected.stdout
@@ -1,4 +1,3 @@
-$DragonFly$
 echo 0
 0
 echo 1