From ac44329e6507b5ffe247c1c452740e73d1e2483c Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Fri, 3 Mar 2017 17:53:10 +0300 Subject: [PATCH] Fix 'overriding commands for target check-without-...' Makefile warnings (fix commit 8f20303) Makefile.am includes cord.am and tests.am, so check-without-test-driver should be defined only at one place. * cord/cord.am (check-without-test-driver): Remove. * tests/tests.am (check-without-test-driver): Add ./cordtest$(EXEEXT) execution. --- cord/cord.am | 5 ----- tests/tests.am | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/cord/cord.am b/cord/cord.am index 4ac2da8..b8794c2 100644 --- a/cord/cord.am +++ b/cord/cord.am @@ -32,8 +32,3 @@ pkginclude_HEADERS += \ include/cord.h \ include/cord_pos.h \ include/ec.h - -# Run the tests directly (without test-driver): -.PHONY: check-without-test-driver -check-without-test-driver: $(TESTS) - ./cordtest$(EXEEXT) diff --git a/tests/tests.am b/tests/tests.am index af581a7..90fbfe0 100644 --- a/tests/tests.am +++ b/tests/tests.am @@ -139,3 +139,4 @@ check-without-test-driver: $(TESTS) test ! -f subthreadcreate_test$(EXEEXT) || ./subthreadcreate_test$(EXEEXT) test ! -f test_cpp$(EXEEXT) || ./test_cpp$(EXEEXT) test ! -f tracetest$(EXEEXT) || ./tracetest$(EXEEXT) + ./cordtest$(EXEEXT) -- 2.7.4