This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
gold patch committed: Use different temporary file names in tests
- From: Ian Lance Taylor <iant at google dot com>
- To: binutils at sourceware dot org
- Cc: ccoutant at google dot com
- Date: Sun, 29 May 2011 10:25:38 -0700
- Subject: gold patch committed: Use different temporary file names in tests
PR gold/12804 points out failures in the gold testsuite, which I have
also seen. The problem is that H.J. and I running the gold testsuite
with -j, while Cary is not. There are three tests which use the same
temporary file name; when run with -j, amusement ensues. This patch
fixes the problem. Committed to mainline.
Ian
2011-05-29 Ian Lance Taylor <iant@google.com>
PR gold/12804
* testsuite/Makefile.am: Use different file name for two_file_test
temporary file for each incremental test.
* testsuite/Makefile.in: Rebuild.
Index: testsuite/Makefile.am
===================================================================
RCS file: /cvs/src/src/gold/testsuite/Makefile.am,v
retrieving revision 1.160
diff -p -u -r1.160 Makefile.am
--- testsuite/Makefile.am 27 May 2011 18:45:38 -0000 1.160
+++ testsuite/Makefile.am 29 May 2011 17:22:26 -0000
@@ -1821,34 +1821,35 @@ memory_test.stdout: memory_test
if DEFAULT_TARGET_X86_64
check_PROGRAMS += incremental_test_2
-MOSTLYCLEANFILES += two_file_test_tmp.o
+MOSTLYCLEANFILES += two_file_test_tmp_2.o
incremental_test_2: two_file_test_1_v1.o two_file_test_1.o two_file_test_1b.o \
two_file_test_2.o two_file_test_main.o gcctestdir/ld
- cp -f two_file_test_1_v1.o two_file_test_tmp.o
- $(CXXLINK) -Wl,--incremental-full -Bgcctestdir/ two_file_test_tmp.o two_file_test_1b.o two_file_test_2.o two_file_test_main.o
+ cp -f two_file_test_1_v1.o two_file_test_tmp_2.o
+ $(CXXLINK) -Wl,--incremental-full -Bgcctestdir/ two_file_test_tmp_2.o two_file_test_1b.o two_file_test_2.o two_file_test_main.o
@sleep 1
- cp -f two_file_test_1.o two_file_test_tmp.o
- $(CXXLINK) -Wl,--incremental-update -Bgcctestdir/ two_file_test_tmp.o two_file_test_1b.o two_file_test_2.o two_file_test_main.o
+ cp -f two_file_test_1.o two_file_test_tmp_2.o
+ $(CXXLINK) -Wl,--incremental-update -Bgcctestdir/ two_file_test_tmp_2.o two_file_test_1b.o two_file_test_2.o two_file_test_main.o
check_PROGRAMS += incremental_test_3
+MOSTLYCLEANFILES += two_file_test_tmp_3.o
incremental_test_3: two_file_test_1.o two_file_test_1b_v1.o two_file_test_1b.o \
two_file_test_2.o two_file_test_main.o gcctestdir/ld
- cp -f two_file_test_1b_v1.o two_file_test_tmp.o
- $(CXXLINK) -Wl,--incremental-full -Bgcctestdir/ two_file_test_1.o two_file_test_tmp.o two_file_test_2.o two_file_test_main.o
+ cp -f two_file_test_1b_v1.o two_file_test_tmp_3.o
+ $(CXXLINK) -Wl,--incremental-full -Bgcctestdir/ two_file_test_1.o two_file_test_tmp_3.o two_file_test_2.o two_file_test_main.o
@sleep 1
- cp -f two_file_test_1b.o two_file_test_tmp.o
- $(CXXLINK) -Wl,--incremental-update -Bgcctestdir/ two_file_test_1.o two_file_test_tmp.o two_file_test_2.o two_file_test_main.o
+ cp -f two_file_test_1b.o two_file_test_tmp_3.o
+ $(CXXLINK) -Wl,--incremental-update -Bgcctestdir/ two_file_test_1.o two_file_test_tmp_3.o two_file_test_2.o two_file_test_main.o
check_PROGRAMS += incremental_test_4
-MOSTLYCLEANFILES += incremental_test_4.base
+MOSTLYCLEANFILES += incremental_test_4.base two_file_test_tmp_4.o
incremental_test_4: two_file_test_1.o two_file_test_1b.o two_file_test_2_v1.o \
two_file_test_2.o two_file_test_main.o gcctestdir/ld
- cp -f two_file_test_2_v1.o two_file_test_tmp.o
- $(CXXLINK) -Wl,--incremental-full -Bgcctestdir/ two_file_test_1.o two_file_test_1b.o two_file_test_tmp.o two_file_test_main.o
+ cp -f two_file_test_2_v1.o two_file_test_tmp_4.o
+ $(CXXLINK) -Wl,--incremental-full -Bgcctestdir/ two_file_test_1.o two_file_test_1b.o two_file_test_tmp_4.o two_file_test_main.o
mv -f incremental_test_4 incremental_test_4.base
@sleep 1
- cp -f two_file_test_2.o two_file_test_tmp.o
- $(CXXLINK) -Wl,--incremental-update,--incremental-base=incremental_test_4.base -Bgcctestdir/ two_file_test_1.o two_file_test_1b.o two_file_test_tmp.o two_file_test_main.o
+ cp -f two_file_test_2.o two_file_test_tmp_4.o
+ $(CXXLINK) -Wl,--incremental-update,--incremental-base=incremental_test_4.base -Bgcctestdir/ two_file_test_1.o two_file_test_1b.o two_file_test_tmp_4.o two_file_test_main.o
endif DEFAULT_TARGET_X86_64