summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2017-09-11 18:53:51 +0300
committerVille Syrjälä <ville.syrjala@linux.intel.com>2017-09-15 15:57:51 +0300
commit28dd0798fa7508076a9da56d7d84a21e789315eb (patch)
tree9cdb4c32582f7fec3067296d8db8d598986ca4b0
parente63b121c7a28d1d50f9b2d0d2dac27a7d339fa36 (diff)
meson: Install test-list.txt
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
-rwxr-xr-xtests/generate_testlist.sh9
-rw-r--r--tests/meson.build9
2 files changed, 14 insertions, 4 deletions
diff --git a/tests/generate_testlist.sh b/tests/generate_testlist.sh
index 6ea78655..a0d53e9f 100755
--- a/tests/generate_testlist.sh
+++ b/tests/generate_testlist.sh
@@ -1,10 +1,13 @@
#!/bin/bash
-echo TESTLIST > $MESON_BUILD_ROOT/tests/test-list.txt
+OUTPUT=$1
+shift
+
+echo TESTLIST > $OUTPUT
while [[ $# -gt 0 ]] ; do
- echo $1 >> $MESON_BUILD_ROOT/tests/test-list.txt
+ echo $1 >> $OUTPUT
shift
done
-echo END TESTLIST >> $MESON_BUILD_ROOT/tests/test-list.txt
+echo END TESTLIST >> $OUTPUT
diff --git a/tests/meson.build b/tests/meson.build
index 6feaafe3..4f636352 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -270,7 +270,14 @@ executable('testdisplay', ['testdisplay.c', 'testdisplay_hotplug.c'],
install : true)
test_progs += 'testdisplay'
-run_command('generate_testlist.sh', test_progs)
+pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), 'intel-gpu-tools')
+
+gen_testlist = find_program('generate_testlist.sh')
+custom_target('testlist',
+ output : 'test-list.txt',
+ command : [ gen_testlist, '@OUTPUT@', test_progs ],
+ install : true,
+ install_dir : pkgdatadir)
test_script = find_program('igt_command_line.sh')
foreach prog : test_progs