Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1555974

Re: [PATCH] selftests/futex: Fix makefile dependencies

Show all headers | View raw

On Fri, Jan 06, 2017 at 01:18:39PM +0900, Stafford Horne wrote:
> I am working on doing selftests for openrisc and found issues with the
> futex test is not building after changes to the tests source.
> 
> This issue is that the TARGETS variable used in the futex Makefile is
> also used by the selftests Makefile, so when building from toplevel the
> TARGETS variable is clobbered and nothing gets built. Changed the
> variable name to get around that.
> 
> Also, the futex makefile did not contain dependencies for all headers,
> so if we make changes to logging.h rebuild will not happen. Add headers
> to fix it up.
> 
> Signed-off-by: Stafford Horne <shorne@gmail.com>

Thanks for catching this and the fix.

+Shuah Khan

Note: This appears also to be a problem for intel_pstate/Makefile

Reviewed-by: Darren Hart <dvhart@linux.intel.com>

> ---
>  tools/testing/selftests/futex/functional/Makefile | 15 +++++++++------
>  1 file changed, 9 insertions(+), 6 deletions(-)
> 
> diff --git a/tools/testing/selftests/futex/functional/Makefile b/tools/testing/selftests/futex/functional/Makefile
> index 9d6b75e..1546cbd 100644
> --- a/tools/testing/selftests/futex/functional/Makefile
> +++ b/tools/testing/selftests/futex/functional/Makefile
> @@ -2,8 +2,11 @@ INCLUDES := -I../include -I../../
>  CFLAGS := $(CFLAGS) -g -O2 -Wall -D_GNU_SOURCE -pthread $(INCLUDES)
>  LDFLAGS := $(LDFLAGS) -pthread -lrt
>  
> -HEADERS := ../include/futextest.h
> -TARGETS := \
> +HEADERS := \
> +	../include/futextest.h \
> +	../include/atomic.h \
> +	../include/logging.h
> +TEST_TARGETS := \
>  	futex_wait_timeout \
>  	futex_wait_wouldblock \
>  	futex_requeue_pi \
> @@ -12,14 +15,14 @@ TARGETS := \
>  	futex_wait_uninitialized_heap \
>  	futex_wait_private_mapped_file
>  
> -TEST_PROGS := $(TARGETS) run.sh
> +TEST_PROGS := $(TEST_TARGETS) run.sh
>  
>  .PHONY: all clean
> -all: $(TARGETS)
> +all: $(TEST_TARGETS)
>  
> -$(TARGETS): $(HEADERS)
> +$(TEST_TARGETS): $(HEADERS)
>  
>  include ../../lib.mk
>  
>  clean:
> -	rm -f $(TARGETS)
> +	rm -f $(TEST_TARGETS)
> -- 
> 2.9.3
> 
> 

-- 
Darren Hart
Intel Open Source Technology Center

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH] selftests/futex: Fix makefile dependencies Stafford Horne <shorne@gmail.com> - 2017-01-06 05:30 +0100
  Re: [PATCH] selftests/futex: Fix makefile dependencies Darren Hart <dvhart@infradead.org> - 2017-01-10 23:20 +0100
    Re: [PATCH] selftests/futex: Fix makefile dependencies Stafford Horne <shorne@gmail.com> - 2017-01-11 05:40 +0100
      Re: [PATCH] selftests/futex: Fix makefile dependencies Darren Hart <dvhart@infradead.org> - 2017-01-11 09:10 +0100
        Re: [PATCH] selftests/futex: Fix makefile dependencies Stafford Horne <shorne@gmail.com> - 2017-01-11 09:50 +0100
          Re: [PATCH] selftests/futex: Fix makefile dependencies Shuah Khan <shuah@kernel.org> - 2017-01-11 15:50 +0100
            Re: [PATCH] selftests/futex: Fix makefile dependencies Stafford Horne <shorne@gmail.com> - 2017-01-11 16:40 +0100
  Re: [PATCH] selftests/futex: Fix makefile dependencies Darren Hart <dvhart@infradead.org> - 2017-01-10 23:20 +0100

csiph-web