Re: [RFC PATCH for 4.15 14/14] Restartable sequences: Provide self-tests

From: Mathieu Desnoyers <hidden>
Date: 2017-10-17 13:48:21
Also in: lkml

----- On Oct 17, 2017, at 6:36 AM, Michael Ellerman mpe-Gsx/Oe8HsFggBc27wqDAHg@public.gmane.org wrote:

Mathieu Desnoyers [off-list ref] writes:

quoted

Hi Michael,

With your changes integrated, both rseq and cpu-opv selftests fail to
build if I pass e.g. -j32 to make.

cd tools/testing/selftests/cpu-opv

efficios@compudjdev:~/git/linux-percpu-dev/tools/testing/selftests/cpu-opv$ make
clean; make
rm -f -r
/home/efficios/git/linux-percpu-dev/tools/testing/selftests/cpu-opv/basic_cpu_opv_test
gcc -O2 -Wall -g -I./ -I../../../../usr/include/    basic_cpu_opv_test.c
cpu-op.c cpu-op.h   -o basic_cpu_opv_test

efficios@compudjdev:~/git/linux-percpu-dev/tools/testing/selftests/cpu-opv$ make
clean; make -j32
rm -f -r
/home/efficios/git/linux-percpu-dev/tools/testing/selftests/cpu-opv/basic_cpu_opv_test
gcc -O2 -Wall -g -I./ -I../../../../usr/include/    basic_cpu_opv_test.c
cpu-op.c cpu-op.h   -o basic_cpu_opv_test
gcc -O2 -Wall -g -I./ -I../../../../usr/include/    basic_cpu_opv_test.c  -o
/home/efficios/git/linux-percpu-dev/tools/testing/selftests/cpu-opv/basic_cpu_opv_test
/tmp/ccDthnqM.o: In function `test_memcpy_op':
/home/efficios/git/linux-percpu-dev/tools/testing/selftests/cpu-opv/basic_cpu_opv_test.c:364:
undefined reference to `cpu_op_get_current_cpu'
/home/efficios/git/linux-percpu-dev/tools/testing/selftests/cpu-opv/basic_cpu_opv_test.c:365:
undefined reference to `cpu_opv'

...

quoted

make: ***
[/home/efficios/git/linux-percpu-dev/tools/testing/selftests/cpu-opv/basic_cpu_opv_test]
Error 1
make: *** Waiting for unfinished jobs....

Any idea what is going on here ?

Ugh sorry, yes.

New patch below should fix it. Tested with -j:

Perfect, folding it into my series.

I see that the "all" target was redundant here.

Thanks,

Mathieu

quoted hunk ↗ jump to hunk

 ~/linux/tools/testing/selftests$ make TARGETS="rseq cpu-opv" -j
 make[1]: Entering directory '/home/michael/linux/tools/testing/selftests/rseq'
 gcc -O2 -Wall -g -I./ -I../cpu-opv/ -I../../../../usr/include/    basic_test.c
 rseq.h rseq-ppc.h rseq-x86.h rseq-arm.h rseq.c ../cpu-opv/cpu-op.c
 ../cpu-opv/cpu-op.h -lpthread -o
 /home/michael/linux/tools/testing/selftests/rseq/basic_test
 gcc -O2 -Wall -g -I./ -I../cpu-opv/ -I../../../../usr/include/
 basic_percpu_ops_test.c rseq.h rseq-ppc.h rseq-x86.h rseq-arm.h rseq.c
 ../cpu-opv/cpu-op.c ../cpu-opv/cpu-op.h -lpthread -o
 /home/michael/linux/tools/testing/selftests/rseq/basic_percpu_ops_test
 gcc -O2 -Wall -g -I./ -I../cpu-opv/ -I../../../../usr/include/    param_test.c
 rseq.h rseq-ppc.h rseq-x86.h rseq-arm.h rseq.c ../cpu-opv/cpu-op.c
 ../cpu-opv/cpu-op.h -lpthread -o
 /home/michael/linux/tools/testing/selftests/rseq/param_test
 make[1]: Leaving directory '/home/michael/linux/tools/testing/selftests/rseq'
 make[1]: Entering directory
 '/home/michael/linux/tools/testing/selftests/cpu-opv'
 gcc -O2 -Wall -g -I./ -I../../../../usr/include/    basic_cpu_opv_test.c
 cpu-op.c cpu-op.h  -o
 /home/michael/linux/tools/testing/selftests/cpu-opv/basic_cpu_opv_test
 make[1]: Leaving directory '/home/michael/linux/tools/testing/selftests/cpu-opv'
 ~/linux/tools/testing/selftests$ make TARGETS="rseq cpu-opv" clean
 make[1]: Entering directory '/home/michael/linux/tools/testing/selftests/rseq'
 rm -f -r /home/michael/linux/tools/testing/selftests/rseq/basic_test
 /home/michael/linux/tools/testing/selftests/rseq/basic_percpu_ops_test
 /home/michael/linux/tools/testing/selftests/rseq/param_test
 make[1]: Leaving directory '/home/michael/linux/tools/testing/selftests/rseq'
 make[1]: Entering directory
 '/home/michael/linux/tools/testing/selftests/cpu-opv'
 rm -f -r /home/michael/linux/tools/testing/selftests/cpu-opv/basic_cpu_opv_test
 make[1]: Leaving directory '/home/michael/linux/tools/testing/selftests/cpu-opv'
 ~/linux/tools/testing/selftests$ cd cpu-opv/
 ~/linux/tools/testing/selftests/cpu-opv$ make -j
 gcc -O2 -Wall -g -I./ -I../../../../usr/include/    basic_cpu_opv_test.c
 cpu-op.c cpu-op.h  -o
 /home/michael/linux/tools/testing/selftests/cpu-opv/basic_cpu_opv_test
 ~/linux/tools/testing/selftests/cpu-opv$ make clean
 rm -f -r /home/michael/linux/tools/testing/selftests/cpu-opv/basic_cpu_opv_test
 ~/linux/tools/testing/selftests/cpu-opv$ cd ../rseq/
 ~/linux/tools/testing/selftests/rseq$ make -j
 gcc -O2 -Wall -g -I./ -I../cpu-opv/ -I../../../../usr/include/    basic_test.c
 rseq.h rseq-ppc.h rseq-x86.h rseq-arm.h rseq.c ../cpu-opv/cpu-op.c
 ../cpu-opv/cpu-op.h -lpthread -o
 /home/michael/linux/tools/testing/selftests/rseq/basic_test
 gcc -O2 -Wall -g -I./ -I../cpu-opv/ -I../../../../usr/include/
 basic_percpu_ops_test.c rseq.h rseq-ppc.h rseq-x86.h rseq-arm.h rseq.c
 ../cpu-opv/cpu-op.c ../cpu-opv/cpu-op.h -lpthread -o
 /home/michael/linux/tools/testing/selftests/rseq/basic_percpu_ops_test
 gcc -O2 -Wall -g -I./ -I../cpu-opv/ -I../../../../usr/include/    param_test.c
 rseq.h rseq-ppc.h rseq-x86.h rseq-arm.h rseq.c ../cpu-opv/cpu-op.c
 ../cpu-opv/cpu-op.h -lpthread -o
 /home/michael/linux/tools/testing/selftests/rseq/param_test
 ~/linux/tools/testing/selftests/rseq$ make clean
 rm -f -r /home/michael/linux/tools/testing/selftests/rseq/basic_test
 /home/michael/linux/tools/testing/selftests/rseq/basic_percpu_ops_test
 /home/michael/linux/tools/testing/selftests/rseq/param_test



cheers

diff --git a/tools/testing/selftests/cpu-opv/Makefile

b/tools/testing/selftests/cpu-opv/Makefile
index 81d0596824ee..d27bd0f74deb 100644

--- a/tools/testing/selftests/cpu-opv/Makefile
+++ b/tools/testing/selftests/cpu-opv/Makefile

@@ -1,13 +1,7 @@

CFLAGS += -O2 -Wall -g -I./ -I../../../../usr/include/
-LDFLAGS += -lpthread

-TESTS = basic_cpu_opv_test
-
-all: $(TESTS)
-%: %.c cpu-op.c cpu-op.h
-       $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+TEST_GEN_PROGS = basic_cpu_opv_test

include ../lib.mk

-clean:
-       $(RM) $(TESTS)
+$(TEST_GEN_PROGS): cpu-op.c cpu-op.h

diff --git a/tools/testing/selftests/rseq/Makefile

b/tools/testing/selftests/rseq/Makefile
index 7f0153556b80..7f625147b7fe 100644

--- a/tools/testing/selftests/rseq/Makefile
+++ b/tools/testing/selftests/rseq/Makefile

@@ -1,13 +1,8 @@

CFLAGS += -O2 -Wall -g -I./ -I../cpu-opv/ -I../../../../usr/include/
-LDFLAGS += -lpthread
+LDLIBS += -lpthread

-TESTS = basic_test basic_percpu_ops_test param_test
-
-all: $(TESTS)
-%: %.c rseq.h rseq-*.h rseq.c ../cpu-opv/cpu-op.c ../cpu-opv/cpu-op.h
-       $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+TEST_GEN_PROGS = basic_test basic_percpu_ops_test param_test

include ../lib.mk

-clean:
-       $(RM) $(TESTS)
+$(TEST_GEN_PROGS): rseq.h rseq-*.h rseq.c ../cpu-opv/cpu-op.c
../cpu-opv/cpu-op.h

-- 
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help