flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-07 16:06:25 +00:00
Code Issues Releases Wiki Activity

tests/gem_concurrent.c: rename to gem_concurrent_all

Browse Source 
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 <tim.gore@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
This commit is contained in:
Tim Gore 2015-04-01 16:36:59 +01:00 committed by Thomas Wood
parent a95033fdbc
commit ebb46bb2e2
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Makefile.am
View File

@ -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)

0
tests/gem_concurrent.c → tests/gem_concurrent_all.c
View File

8
tests/gem_concurrent_blit.c Normal file
View File

@ -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"