Make ABI tests generate .out files.

If you rerun "make check" in a tree where some tests have already been
run, it will rerun ABI tests because those do not create an output
file.

This patch changes those tests to create .out files so they only get
rerun if the dependencies (on the ABI baselines and the generated
.symlist files) indicate they should be rerun.

Tested x86_64.

	* Makerules (check-abi-%): Change target to
	$(objpfx)check-abi-%.out.
	(check-abi target): Update dependencies.
	(check-abi-pattern variable): Redirect output of diff to $@.
	(check-abi variable): Likewise.
	* elf/Makefile (check-abi): Update dependencies.

diff --git a/ChangeLog b/ChangeLog
index a7dc4124925a668675b56c055af471cc774d6afe..e231408a264b8e1230171a41e0c14994abd6461e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2014-02-12  Joseph Myers  <joseph@codesourcery.com>
 
+       * Makerules (check-abi-%): Change target to
+       $(objpfx)check-abi-%.out.
+       (check-abi target): Update dependencies.
+       (check-abi-pattern variable): Redirect output of diff to $@.
+       (check-abi variable): Likewise.
+       * elf/Makefile (check-abi): Update dependencies.
+
        * soft-fp/op-common.h (_FP_DECL): Mark exponent as possibly
        unused.
        (_FP_PACK_SEMIRAW): Determine tininess based on rounding shifted

diff --git a/Makerules b/Makerules
index b46b09b369b4e1c5c7a99e523f22e9f4a3d0969f..13c3faec3f456d81f687405bc81c72ee91de0d59 100644 (file)
--- a/Makerules
+++ b/Makerules
@@ -1193,21 +1193,25 @@ vpath %.abilist $(+sysdep_dirs)
 generated += $(extra-libs:=.symlist)
 
 ifdef abilist-pattern
-check-abi-%: $(common-objpfx)config.make $(abilist-pattern) $(objpfx)%.symlist
+$(objpfx)check-abi-%.out: $(common-objpfx)config.make $(abilist-pattern) \
+                         $(objpfx)%.symlist
        $(check-abi-pattern)
-check-abi-%: $(common-objpfx)config.make $(abilist-pattern) \
-            $(common-objpfx)%.symlist
+$(objpfx)check-abi-%.out: $(common-objpfx)config.make $(abilist-pattern) \
+                         $(common-objpfx)%.symlist
        $(check-abi-pattern)
 endif
-check-abi-%: $(common-objpfx)config.make %.abilist $(objpfx)%.symlist
+$(objpfx)check-abi-%.out: $(common-objpfx)config.make %.abilist \
+                         $(objpfx)%.symlist
        $(check-abi)
-check-abi-%: $(common-objpfx)config.make %.abilist $(common-objpfx)%.symlist
+$(objpfx)check-abi-%.out: $(common-objpfx)config.make %.abilist \
+                         $(common-objpfx)%.symlist
        $(check-abi)
 define check-abi-pattern
-       diff -p -U 0 $(filter $(abilist-pattern),$^) $(filter %.symlist,$^)
+       diff -p -U 0 $(filter $(abilist-pattern),$^) $(filter %.symlist,$^) \
+            > $@
 endef
 define check-abi
-       diff -p -U 0 $(filter %.abilist,$^) $(filter %.symlist,$^)
+       diff -p -U 0 $(filter %.abilist,$^) $(filter %.symlist,$^) > $@
 endef
 
 ifdef abilist-pattern
@@ -1239,7 +1243,7 @@ endef
 
 .PHONY: update-abi check-abi
 update-abi: $(patsubst %.so,update-abi-%,$(install-lib.so-versioned))
-check-abi: $(patsubst %.so,check-abi-%,$(install-lib.so-versioned))
+check-abi: $(patsubst %.so,$(objpfx)check-abi-%.out,$(install-lib.so-versioned))
 ifdef subdir
 subdir_check-abi: check-abi
 subdir_update-abi: update-abi
@@ -1249,7 +1253,7 @@ update-abi: subdir_update-abi
 endif
 
 ifeq ($(subdir),elf)
-check-abi: check-abi-libc
+check-abi: $(objpfx)check-abi-libc.out
 update-abi: update-abi-libc
 common-generated += libc.symlist
 endif

diff --git a/elf/Makefile b/elf/Makefile
index 4c58fc9c24613fe9c56fda4ec9f7fbdb0f4df91a..a684b6b1131872a7e7f060fb4a3a425d4db5cdb8 100644 (file)
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -255,7 +255,7 @@ endif
 
 include ../Rules
 
-check-abi: check-abi-ld
+check-abi: $(objpfx)check-abi-ld.out
 update-abi: update-abi-ld
 
 ifeq (yes,$(build-shared))