Module Name: src
Committed By: rillig
Date: Sun Aug 16 14:39:50 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: archive.exp archive.mk
Log Message:
make(1): fix archive test
At the beginning of that test, the library archive obviously does not
exist yet.
This test failure is a bit hard to detect since the test is disabled in
usr.bin/make, but not in tests/usr.bin/make. This is because the latter
just runs all .mk files as tests, no matter whether they are commented
out or not.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/archive.exp
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/archive.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/unit-tests/archive.exp
diff -u src/usr.bin/make/unit-tests/archive.exp:1.1 src/usr.bin/make/unit-tests/archive.exp:1.2
--- src/usr.bin/make/unit-tests/archive.exp:1.1 Mon Jul 27 18:51:03 2020
+++ src/usr.bin/make/unit-tests/archive.exp Sun Aug 16 14:39:50 2020
@@ -1,3 +1,4 @@
+rm -f libprog.a
ar cru libprog.a archive.mk modmisc.mk varmisc.mk
ranlib libprog.a
ar t libprog.a
@@ -6,5 +7,5 @@ modmisc.mk
varmisc.mk
depend-on-existing-member
`depend-on-nonexistent-member' is up to date.
-rm libprog.a
+rm -f libprog.a
exit status 0
Index: src/usr.bin/make/unit-tests/archive.mk
diff -u src/usr.bin/make/unit-tests/archive.mk:1.2 src/usr.bin/make/unit-tests/archive.mk:1.3
--- src/usr.bin/make/unit-tests/archive.mk:1.2 Sat Aug 15 01:49:07 2020
+++ src/usr.bin/make/unit-tests/archive.mk Sun Aug 16 14:39:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: archive.mk,v 1.2 2020/08/15 01:49:07 rillig Exp $
+# $NetBSD: archive.mk,v 1.3 2020/08/16 14:39:50 rillig Exp $
#
# Very basic demonstration of handling archives, based on the description
# in PSD.doc/tutorial.ms.
@@ -35,4 +35,4 @@ depend-on-nonexistent-member: ${ARCHIVE}
${RUN} echo $@
remove-archive:
- rm ${ARCHIVE}
+ rm -f ${ARCHIVE}
