public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/portage-utils:master commit in: tests/copy_file/, tests/atom_explode/, tests/rmspace/, tests/mkdir/
@ 2019-04-14 15:47 Fabian Groffen
  0 siblings, 0 replies; only message in thread
From: Fabian Groffen @ 2019-04-14 15:47 UTC (permalink / raw
  To: gentoo-commits

commit:     4b84f159c55e1b73515dafb3c647e1e243a95778
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 14 15:46:43 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 15:46:43 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=4b84f159

tests: avoid race due to duplicate check target

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 tests/atom_explode/Makefile.am | 6 ++----
 tests/atom_explode/Makefile.in | 9 ++++-----
 tests/copy_file/Makefile.am    | 4 +---
 tests/copy_file/Makefile.in    | 7 +++----
 tests/mkdir/Makefile.am        | 4 +---
 tests/mkdir/Makefile.in        | 7 +++----
 tests/rmspace/Makefile.am      | 4 +---
 tests/rmspace/Makefile.in      | 7 +++----
 8 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/tests/atom_explode/Makefile.am b/tests/atom_explode/Makefile.am
index ddaaf8c..ecdcc58 100644
--- a/tests/atom_explode/Makefile.am
+++ b/tests/atom_explode/Makefile.am
@@ -12,8 +12,6 @@ e_LDADD = $(top_builddir)/libq/libq.la \
 		  $(LIB_CLOCK_GETTIME) \
 		  $(LIB_EACCESS)
 
-test check: dotest basic
-
 basic: e
 	./e < $(s)/basic.tests > basic
 	diff -u $(s)/basic.good basic
@@ -21,7 +19,7 @@ basic: e
 dotest: e
 	$(s)/dotest
 
+check-local: dotest basic
+
 clean-local:
 	rm -f me py q basic
-
-.PHONY: all basic dotest test check clean-local

diff --git a/tests/atom_explode/Makefile.in b/tests/atom_explode/Makefile.in
index cdec9c8..662044b 100644
--- a/tests/atom_explode/Makefile.in
+++ b/tests/atom_explode/Makefile.in
@@ -1629,6 +1629,7 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
+	$(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-am
 all-am: Makefile
 installdirs:
@@ -1735,7 +1736,7 @@ uninstall-am:
 
 .MAKE: check-am install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \
 	clean-checkPROGRAMS clean-generic clean-libtool clean-local \
 	cscopelist-am ctags ctags-am distclean distclean-compile \
 	distclean-generic distclean-libtool distclean-tags distdir dvi \
@@ -1752,8 +1753,6 @@ uninstall-am:
 .PRECIOUS: Makefile
 
 
-test check: dotest basic
-
 basic: e
 	./e < $(s)/basic.tests > basic
 	diff -u $(s)/basic.good basic
@@ -1761,11 +1760,11 @@ basic: e
 dotest: e
 	$(s)/dotest
 
+check-local: dotest basic
+
 clean-local:
 	rm -f me py q basic
 
-.PHONY: all basic dotest test check clean-local
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/tests/copy_file/Makefile.am b/tests/copy_file/Makefile.am
index 13d22a8..87290be 100644
--- a/tests/copy_file/Makefile.am
+++ b/tests/copy_file/Makefile.am
@@ -12,9 +12,7 @@ m_LDADD = $(top_builddir)/libq/libq.la \
 		  $(LIB_CLOCK_GETTIME) \
 		  $(LIB_EACCESS)
 
-test check: dotest
-
 dotest: m
 	$(s)/dotest
 
-.PHONY: all basic dotest test check
+check-local: dotest

diff --git a/tests/copy_file/Makefile.in b/tests/copy_file/Makefile.in
index 0d3c832..159ba5d 100644
--- a/tests/copy_file/Makefile.in
+++ b/tests/copy_file/Makefile.in
@@ -1629,6 +1629,7 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
+	$(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-am
 all-am: Makefile
 installdirs:
@@ -1735,7 +1736,7 @@ uninstall-am:
 
 .MAKE: check-am install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \
 	clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \
 	ctags ctags-am distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
@@ -1752,12 +1753,10 @@ uninstall-am:
 .PRECIOUS: Makefile
 
 
-test check: dotest
-
 dotest: m
 	$(s)/dotest
 
-.PHONY: all basic dotest test check
+check-local: dotest
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

diff --git a/tests/mkdir/Makefile.am b/tests/mkdir/Makefile.am
index 88b555f..e9d1536 100644
--- a/tests/mkdir/Makefile.am
+++ b/tests/mkdir/Makefile.am
@@ -12,9 +12,7 @@ m_LDADD = $(top_builddir)/libq/libq.la \
 		  $(LIB_CLOCK_GETTIME) \
 		  $(LIB_EACCESS)
 
-test check: dotest
-
 dotest: m
 	$(s)/dotest
 
-.PHONY: all basic dotest test check
+check-local: dotest

diff --git a/tests/mkdir/Makefile.in b/tests/mkdir/Makefile.in
index 916924e..2aadccc 100644
--- a/tests/mkdir/Makefile.in
+++ b/tests/mkdir/Makefile.in
@@ -1629,6 +1629,7 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
+	$(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-am
 all-am: Makefile
 installdirs:
@@ -1735,7 +1736,7 @@ uninstall-am:
 
 .MAKE: check-am install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \
 	clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \
 	ctags ctags-am distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
@@ -1752,12 +1753,10 @@ uninstall-am:
 .PRECIOUS: Makefile
 
 
-test check: dotest
-
 dotest: m
 	$(s)/dotest
 
-.PHONY: all basic dotest test check
+check-local: dotest
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

diff --git a/tests/rmspace/Makefile.am b/tests/rmspace/Makefile.am
index 3f830e5..cb54f32 100644
--- a/tests/rmspace/Makefile.am
+++ b/tests/rmspace/Makefile.am
@@ -12,9 +12,7 @@ m_LDADD = $(top_builddir)/libq/libq.la \
 		  $(LIB_CLOCK_GETTIME) \
 		  $(LIB_EACCESS)
 
-test check: dotest
-
 dotest: m
 	$(s)/dotest
 
-.PHONY: all basic dotest test check
+check-local: dotest

diff --git a/tests/rmspace/Makefile.in b/tests/rmspace/Makefile.in
index 3515b32..e45eebe 100644
--- a/tests/rmspace/Makefile.in
+++ b/tests/rmspace/Makefile.in
@@ -1629,6 +1629,7 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
+	$(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-am
 all-am: Makefile
 installdirs:
@@ -1735,7 +1736,7 @@ uninstall-am:
 
 .MAKE: check-am install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \
 	clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \
 	ctags ctags-am distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
@@ -1752,12 +1753,10 @@ uninstall-am:
 .PRECIOUS: Makefile
 
 
-test check: dotest
-
 dotest: m
 	$(s)/dotest
 
-.PHONY: all basic dotest test check
+check-local: dotest
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2019-04-14 15:47 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-14 15:47 [gentoo-commits] proj/portage-utils:master commit in: tests/copy_file/, tests/atom_explode/, tests/rmspace/, tests/mkdir/ Fabian Groffen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox