From ebb46bb2e2138b5f864a3fdff21d013d03e7931f Mon Sep 17 00:00:00 2001 From: Tim Gore Date: Wed, 1 Apr 2015 16:36:59 +0100 Subject: [PATCH] tests/gem_concurrent.c: rename to gem_concurrent_all Recent patch #7763349a9a87.. renamed gem_concurrent_blit.c to gem_concurrent.c and then added entries to Makefile.am to make two identical executeables (but with different names) from this source file. This executeable changes its behaviour based on argv[0]. But, this has broken the Android build, which does not use autotools. This patch instead renames the source file to match the name of one executable (gem_concurrent_all.c) and creates a second source file which simply #includes the first. The Makefile.am entries are also removed. This restores the simple test.c -> test executeable relationship seen in the rest of IGT and allows the Android build system to work without parsing Makfile.am or having to incorporate a special workaround for this test. Signed-off-by: Tim Gore Reviewed-by: Chris Wilson Signed-off-by: Thomas Wood --- tests/Makefile.am | 2 -- tests/{gem_concurrent.c => gem_concurrent_all.c} | 0 tests/gem_concurrent_blit.c | 8 ++++++++ 3 files changed, 8 insertions(+), 2 deletions(-) rename tests/{gem_concurrent.c => gem_concurrent_all.c} (100%) create mode 100644 tests/gem_concurrent_blit.c diff --git a/tests/Makefile.am b/tests/Makefile.am index 69c7c4e0..7fbf6221 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -69,8 +69,6 @@ gem_ctx_basic_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS) gem_ctx_basic_LDADD = $(LDADD) -lpthread gem_ctx_thrash_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS) gem_ctx_thrash_LDADD = $(LDADD) -lpthread -gem_concurrent_all_SOURCES = gem_concurrent.c -gem_concurrent_blit_SOURCES = gem_concurrent.c gem_fence_thrash_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS) gem_fence_thrash_LDADD = $(LDADD) -lpthread gem_fence_upload_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS) diff --git a/tests/gem_concurrent.c b/tests/gem_concurrent_all.c similarity index 100% rename from tests/gem_concurrent.c rename to tests/gem_concurrent_all.c diff --git a/tests/gem_concurrent_blit.c b/tests/gem_concurrent_blit.c new file mode 100644 index 00000000..513de4a1 --- /dev/null +++ b/tests/gem_concurrent_blit.c @@ -0,0 +1,8 @@ +/* This test is just a duplicate of gem_concurrent_all. */ +/* However the executeable will be gem_concurrent_blit. */ +/* The main function examines argv[0] and, in the case */ +/* of gem_concurent_blit runs only a subset of the */ +/* available subtests. This avoids the use of */ +/* non-standard command line parameters which can cause */ +/* problems for automated testing */ +#include "gem_concurrent_all.c"