summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2003-10-18 10:20:59 +0000
committerEric Andersen <andersen@codepoet.org>2003-10-18 10:20:59 +0000
commitdd3fb0f8c1c10fcee804f11a4eed84316c5f694b (patch)
tree916c96c10d0178fa6f1c8d176f2c2d0bf72338b0 /test
parent49f0dd0fcb64746b1ef06e094f2fa8091c23637c (diff)
Peter Kjellerstedt writes:
rm.patch: * Define $(RM) as rm -f in Rules.mak and test/Rules.mak (this is the same definition as gmake uses by default). * Change all occurrences of rm and rm -f into $(RM).
Diffstat (limited to 'test')
-rw-r--r--test/Makefile2
-rw-r--r--test/Rules.mak2
-rw-r--r--test/args/Makefile2
-rw-r--r--test/assert/Makefile2
-rw-r--r--test/crypt/Makefile2
-rw-r--r--test/ctype/Makefile2
-rw-r--r--test/dlopen/Makefile2
-rw-r--r--test/malloc/Makefile2
-rw-r--r--test/math/Makefile2
-rw-r--r--test/misc/Makefile4
-rw-r--r--test/mmap/Makefile2
-rw-r--r--test/pthread/Makefile2
-rw-r--r--test/pwd_grp/Makefile2
-rw-r--r--test/setjmp/Makefile2
-rw-r--r--test/signal/Makefile2
-rw-r--r--test/silly/Makefile4
-rw-r--r--test/stat/Makefile4
-rw-r--r--test/stdlib/Makefile2
-rw-r--r--test/string/Makefile2
-rw-r--r--test/termios/Makefile2
-rw-r--r--test/unistd/Makefile2
21 files changed, 25 insertions, 23 deletions
diff --git a/test/Makefile b/test/Makefile
index 2a0f3c0a2..397cc42b7 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -44,7 +44,7 @@ tags:
ctags -R
clean: subdirs_clean
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
subdirs: $(patsubst %, _dir_%, $(DIRS))
subdirs_clean: $(patsubst %, _dirclean_%, $(ALL_SUBDIRS))
diff --git a/test/Rules.mak b/test/Rules.mak
index 42c8cdd33..7b41594b2 100644
--- a/test/Rules.mak
+++ b/test/Rules.mak
@@ -46,6 +46,8 @@ CC= $(CROSS)gcc
STRIPTOOL=strip
LDD=../$(TESTDIR)ldso/util/ldd
+RM= rm -f
+
# Select the compiler needed to build binaries for your development system
HOSTCC=gcc
HOSTCFLAGS=-O2 -Wall
diff --git a/test/args/Makefile b/test/args/Makefile
index a5a01dbf8..cc4637bc0 100644
--- a/test/args/Makefile
+++ b/test/args/Makefile
@@ -35,6 +35,6 @@ arg_test: arg_test.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-@ echo " "
clean:
- rm -f *.[oa] *~ core $(TARGETS)
+ $(RM) *.[oa] *~ core $(TARGETS)
diff --git a/test/assert/Makefile b/test/assert/Makefile
index 71f231d69..1933cfed0 100644
--- a/test/assert/Makefile
+++ b/test/assert/Makefile
@@ -35,6 +35,6 @@ assert: assert.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-@ echo " "
clean:
- rm -f *.[oa] *~ core $(TARGETS)
+ $(RM) *.[oa] *~ core $(TARGETS)
diff --git a/test/crypt/Makefile b/test/crypt/Makefile
index 78732ec8c..c7c7b3202 100644
--- a/test/crypt/Makefile
+++ b/test/crypt/Makefile
@@ -68,6 +68,6 @@ md5c-test: md5c-test.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-@ echo " "
clean:
- rm -f *.[oa] *~ core crypt_glibc crypt crypt_glibc.out crypt.out md5c-test
+ $(RM) *.[oa] *~ core crypt_glibc crypt crypt_glibc.out crypt.out md5c-test
diff --git a/test/ctype/Makefile b/test/ctype/Makefile
index 16c49c284..e3595618e 100644
--- a/test/ctype/Makefile
+++ b/test/ctype/Makefile
@@ -35,6 +35,6 @@ ctype_run:
./ctype
-@ echo " "
clean:
- rm -f *.[oa] *~ core $(TARGETS)
+ $(RM) *.[oa] *~ core $(TARGETS)
diff --git a/test/dlopen/Makefile b/test/dlopen/Makefile
index 529f08a08..286165361 100644
--- a/test/dlopen/Makefile
+++ b/test/dlopen/Makefile
@@ -71,6 +71,6 @@ run: libtest2.so libtest1.so test1 test2 test3 dltest libtest.so dltest2 libtest
-$(DEBUG_LIBS)=all ./dltest
clean:
- rm -f *.o libtest1.so* libtest2.so* test1 test2 test3 \
+ $(RM) *.o libtest1.so* libtest2.so* test1 test2 test3 \
dltest dltest2 libtest.so libtest3.so
diff --git a/test/malloc/Makefile b/test/malloc/Makefile
index dc10cc74f..7fdef736e 100644
--- a/test/malloc/Makefile
+++ b/test/malloc/Makefile
@@ -124,6 +124,6 @@ realloc0_glibc: realloc0.c Makefile
clean:
- rm -f *.[oa] *~ core $(TARGETS)
+ $(RM) *.[oa] *~ core $(TARGETS)
diff --git a/test/math/Makefile b/test/math/Makefile
index c9231c5fc..2133904c9 100644
--- a/test/math/Makefile
+++ b/test/math/Makefile
@@ -100,6 +100,6 @@ libm-test.c: $(ulps-file) libm-test.inc gen-libm-test.pl
$(PERL) ./gen-libm-test.pl -u $< ./libm-test.inc -o "." 2>&1 > /dev/null
clean:
- rm -f *.[oa] *~ core $(TARGETS) $(generated) rint_glibc.out rint.out
+ $(RM) *.[oa] *~ core $(TARGETS) $(generated) rint_glibc.out rint.out
diff --git a/test/misc/Makefile b/test/misc/Makefile
index d94e48747..828f6b282 100644
--- a/test/misc/Makefile
+++ b/test/misc/Makefile
@@ -58,7 +58,7 @@ fdopen: fdopen.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-@ echo " "
dirent_source:
- -@ rm -f $(TARGETS)
+ -@ $(RM) $(TARGETS)
-@ echo "-------"
-@ echo "dirent.c source: "
-@ echo " "
@@ -126,7 +126,7 @@ dirent64_diff: dirent64 dirent64_glibc
-@ echo " "
clean:
- rm -f *.[oa] *~ core dirent dirent_glibc dirent_glibc.out dirent.out \
+ $(RM) *.[oa] *~ core dirent dirent_glibc dirent_glibc.out dirent.out \
dirent64 dirent64_glibc dirent64_glibc.out dirent64.out \
outb sem fdopen
diff --git a/test/mmap/Makefile b/test/mmap/Makefile
index fd7585545..70d17b756 100644
--- a/test/mmap/Makefile
+++ b/test/mmap/Makefile
@@ -35,6 +35,6 @@ mmap: mmap.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-@ echo " "
clean:
- rm -f *.[oa] *~ core $(TARGETS)
+ $(RM) *.[oa] *~ core $(TARGETS)
diff --git a/test/pthread/Makefile b/test/pthread/Makefile
index 16eb16e0f..1e51a4b2a 100644
--- a/test/pthread/Makefile
+++ b/test/pthread/Makefile
@@ -86,5 +86,5 @@ ex7: ex7.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
-@ echo " "
clean:
- rm -f *.[oa] *~ core $(TARGETS)
+ $(RM) *.[oa] *~ core $(TARGETS)
diff --git a/test/pwd_grp/Makefile b/test/pwd_grp/Makefile
index 3a3b3b572..f1f63b406 100644
--- a/test/pwd_grp/Makefile
+++ b/test/pwd_grp/Makefile
@@ -87,6 +87,6 @@ test_grp_diff: test_grp_glibc test_grp
-@ echo " "
clean:
- rm -f *.[oa] *~ core $(TARGETS) *.out
+ $(RM) *.[oa] *~ core $(TARGETS) *.out
diff --git a/test/setjmp/Makefile b/test/setjmp/Makefile
index a4a35191e..569a5f332 100644
--- a/test/setjmp/Makefile
+++ b/test/setjmp/Makefile
@@ -35,6 +35,6 @@ setjmp_test: setjmp_test.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-@ echo " "
clean:
- rm -f *.[oa] *~ core $(TARGETS)
+ $(RM) *.[oa] *~ core $(TARGETS)
diff --git a/test/signal/Makefile b/test/signal/Makefile
index 662ee4da5..904ea8524 100644
--- a/test/signal/Makefile
+++ b/test/signal/Makefile
@@ -69,6 +69,6 @@ sigchld_glibc: sigchld.c Makefile
-@ echo " "
clean:
- rm -f *.[oa] *~ core $(TARGETS)
+ $(RM) *.[oa] *~ core $(TARGETS)
diff --git a/test/silly/Makefile b/test/silly/Makefile
index afe591f9a..2678bb225 100644
--- a/test/silly/Makefile
+++ b/test/silly/Makefile
@@ -26,7 +26,7 @@ TARGETS=hello_source hello hello_glibc tiny
all: $(TARGETS)
hello_source:
- -@ rm -f $(TARGETS)
+ -@ $(RM) $(TARGETS)
-@ echo "-------"
-@ echo "hello.c source: "
-@ echo " "
@@ -75,6 +75,6 @@ tiny: tiny.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
clean:
- rm -f *.[oa] *~ core $(TARGETS)
+ $(RM) *.[oa] *~ core $(TARGETS)
diff --git a/test/stat/Makefile b/test/stat/Makefile
index 5c284fb05..39e5b2d4f 100644
--- a/test/stat/Makefile
+++ b/test/stat/Makefile
@@ -27,7 +27,7 @@ TARGETS=stat_diff stat64_diff
all: $(TARGETS)
stat_source:
- -@ rm -f $(TARGETS)
+ -@ $(RM) $(TARGETS)
-@ echo "-------"
-@ echo "stat.c source: "
-@ echo " "
@@ -95,7 +95,7 @@ stat64_diff: stat64 stat64_glibc
-@ echo " "
clean:
- rm -f *.[oa] *~ core stat stat_glibc stat_glibc.out stat.out \
+ $(RM) *.[oa] *~ core stat stat_glibc stat_glibc.out stat.out \
stat64 stat64_glibc stat64_glibc.out stat64.out
diff --git a/test/stdlib/Makefile b/test/stdlib/Makefile
index 8747c2a37..38ad960fe 100644
--- a/test/stdlib/Makefile
+++ b/test/stdlib/Makefile
@@ -187,6 +187,6 @@ ptytest: ptytest.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
clean:
- rm -f *.[oa] *~ core $(TARGETS) *.out
+ $(RM) *.[oa] *~ core $(TARGETS) *.out
diff --git a/test/string/Makefile b/test/string/Makefile
index df83b78fa..e25da9ca9 100644
--- a/test/string/Makefile
+++ b/test/string/Makefile
@@ -103,6 +103,6 @@ strsignal: ../../libc/string/strsignal.c
clean:
- rm -f *.[oa] *~ core $(TARGETS) testcopy.gnu.out testcopy.out
+ $(RM) *.[oa] *~ core $(TARGETS) testcopy.gnu.out testcopy.out
diff --git a/test/termios/Makefile b/test/termios/Makefile
index 881cf48e5..2d48251b9 100644
--- a/test/termios/Makefile
+++ b/test/termios/Makefile
@@ -52,6 +52,6 @@ termios_glibc: termios.c Makefile
-@ echo " "
clean:
- rm -f *.[oa] *~ core $(TARGETS)
+ $(RM) *.[oa] *~ core $(TARGETS)
diff --git a/test/unistd/Makefile b/test/unistd/Makefile
index f64b5428c..8be5b6dc9 100644
--- a/test/unistd/Makefile
+++ b/test/unistd/Makefile
@@ -101,6 +101,6 @@ preadwrite: preadwrite.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-@ echo " "
clean:
- rm -f *.[oa] *~ core $(TARGETS)
+ $(RM) *.[oa] *~ core $(TARGETS)