public inbox for igt-dev@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Petri Latvala <petri.latvala@intel.com>
Subject: [igt-dev] [PATCH i-g-t 3/3] Makefile: Do not nest new gem tests in i915 directory
Date: Wed,  5 Jun 2019 10:45:14 +0300	[thread overview]
Message-ID: <20190605074514.7375-3-arkadiusz.hiler@intel.com> (raw)
In-Reply-To: <20190605074514.7375-1-arkadiusz.hiler@intel.com>

$ diff <(sed "s/ /\n/g" meson-test-list.txt | grep -v 'vc4\|v3d\|panfrost' | sort) <(sed "s/ /\n/g" autotools-test-list.txt | sort)
30d29
< gem_ctx_clone
32d30
< gem_ctx_engines
36d33
< gem_ctx_shared
137d133
< gem_vm_create
145a142,146
> i915/gem_ctx_clone
> i915/gem_ctx_engines
> i915/gem_ctx_shared
> i915/gem_exec_balancer
> i915/gem_vm_create

Let's make this consistent with meson and all the other gem tests we
have.

Cc: Petri Latvala <petri.latvala@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
---
 tests/Makefile.am      |  2 +-
 tests/Makefile.sources | 20 +++++++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index c6af0aea..5a428b8a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -96,7 +96,7 @@ gem_close_race_LDADD = $(LDADD) -lpthread
 gem_ctx_thrash_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
 gem_ctx_thrash_LDADD = $(LDADD) -lpthread
 gem_ctx_sseu_LDADD = $(LDADD) $(top_builddir)/lib/libigt_perf.la
-i915_gem_exec_balancer_LDADD = $(LDADD) $(top_builddir)/lib/libigt_perf.la
+gem_exec_balancer_LDADD = $(LDADD) $(top_builddir)/lib/libigt_perf.la
 gem_exec_capture_LDADD = $(LDADD) -lz
 gem_exec_parallel_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
 gem_exec_parallel_LDADD = $(LDADD) -lpthread
diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index cf38792f..027ed82f 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -22,11 +22,6 @@ TESTS_progs = \
 	drm_import_export \
 	drm_mm \
 	drm_read \
-	i915/gem_ctx_clone \
-	i915/gem_ctx_engines \
-	i915/gem_ctx_shared \
-	i915/gem_exec_balancer \
-	i915/gem_vm_create \
 	kms_3d \
 	kms_addfb_basic \
 	kms_atomic \
@@ -137,9 +132,15 @@ gem_cs_tlb_SOURCES = i915/gem_cs_tlb.c
 TESTS_progs += gem_ctx_bad_destroy
 gem_ctx_bad_destroy_SOURCES = i915/gem_ctx_bad_destroy.c
 
+TESTS_progs += gem_ctx_clone
+gem_ctx_clone_SOURCES = i915/gem_ctx_clone.c
+
 TESTS_progs += gem_ctx_create
 gem_ctx_create_SOURCES = i915/gem_ctx_create.c
 
+TESTS_progs += gem_ctx_engines
+gem_ctx_engines_SOURCES = i915/gem_ctx_engines.c
+
 TESTS_progs += gem_ctx_exec
 gem_ctx_exec_SOURCES = i915/gem_ctx_exec.c
 
@@ -149,6 +150,9 @@ gem_ctx_isolation_SOURCES = i915/gem_ctx_isolation.c
 TESTS_progs += gem_ctx_param
 gem_ctx_param_SOURCES = i915/gem_ctx_param.c
 
+TESTS_progs += gem_ctx_shared
+gem_ctx_shared_SOURCES = i915/gem_ctx_shared.c
+
 TESTS_progs += gem_ctx_sseu
 gem_ctx_sseu_SOURCES = i915/gem_ctx_sseu.c
 
@@ -182,6 +186,9 @@ gem_exec_await_SOURCES = i915/gem_exec_await.c
 TESTS_progs += gem_exec_bad_domains
 gem_exec_bad_domains_SOURCES = i915/gem_exec_bad_domains.c
 
+TESTS_progs += gem_exec_balancer
+gem_exec_balancer_SOURCES = i915/gem_exec_balancer.c
+
 TESTS_progs += gem_exec_basic
 gem_exec_basic_SOURCES = i915/gem_exec_basic.c
 
@@ -512,6 +519,9 @@ i915_selftest_SOURCES = i915/i915_selftest.c
 TESTS_progs += i915_suspend
 i915_suspend_SOURCES = i915/i915_suspend.c
 
+TESTS_progs += gem_vm_create
+gem_vm_create_SOURCES = i915/gem_vm_create.c
+
 TESTS_progs_X = gem_concurrent_all
 gem_concurrent_all_SOURCES = i915/gem_concurrent_all.c
 
-- 
2.21.0

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

  parent reply	other threads:[~2019-06-05  7:45 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-05  7:45 [igt-dev] [PATCH i-g-t 1/3] tests/gem_exec_balancer: Manually calculate VLA struct sizes Arkadiusz Hiler
2019-06-05  7:45 ` [igt-dev] [PATCH i-g-t 2/3] meson: Add gem_exec_balancer to test-list.txt Arkadiusz Hiler
2019-06-05  7:45 ` Arkadiusz Hiler [this message]
2019-06-06  8:59   ` [igt-dev] [PATCH i-g-t 3/3] Makefile: Do not nest new gem tests in i915 directory Chris Wilson
2019-06-06  9:08     ` Arkadiusz Hiler
2019-06-05  8:14 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/3] tests/gem_exec_balancer: Manually calculate VLA struct sizes Patchwork
2019-06-06  8:26 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190605074514.7375-3-arkadiusz.hiler@intel.com \
    --to=arkadiusz.hiler@intel.com \
    --cc=igt-dev@lists.freedesktop.org \
    --cc=petri.latvala@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox