[Intel-gfx] [PATCH i-g-t v2] tests/drm_lib.sh: Extract fake getopt options so it can sourced into tests that require it.
Marius Vlad
marius.c.vlad at intel.com
Tue Jun 21 12:34:07 UTC 2016
This should allow tests/vgem_reload_basic to pass check target and it
doesn't depend of i915 being present.
v2: Do not source drm_lib.sh, only fake getopt parsing
option to again access to --list-subtests option (Chris)
Signed-off-by: Marius Vlad <marius.c.vlad at intel.com>
CC: Chris Wilson <chris at chris-wilson.co.uk>
---
tests/drm_getopt.sh | 38 ++++++++++++++++++++++++++++++++++++++
tests/drm_lib.sh | 35 ++---------------------------------
tests/vgem_reload_basic | 3 +++
3 files changed, 43 insertions(+), 33 deletions(-)
create mode 100644 tests/drm_getopt.sh
diff --git a/tests/drm_getopt.sh b/tests/drm_getopt.sh
new file mode 100644
index 0000000..a94a759
--- /dev/null
+++ b/tests/drm_getopt.sh
@@ -0,0 +1,38 @@
+# This is required for check/distcheck target as it has to --list-subtests
+# for each test. Source it if you add a new test in form of a (shell) script.
+
+# See tests/vgem_reload_basic
+
+IGT_EXIT_TIMEOUT=78
+IGT_EXIT_SKIP=77
+IGT_EXIT_SUCCESS=0
+IGT_EXIT_INVALID=79
+IGT_EXIT_FAILURE=99
+
+# hacked-up long option parsing
+for arg in $@ ; do
+ case $arg in
+ --list-subtests)
+ exit $IGT_EXIT_INVALID
+ ;;
+ --run-subtest)
+ exit $IGT_EXIT_INVALID
+ ;;
+ --debug)
+ IGT_LOG_LEVEL=debug
+ ;;
+ --help-description)
+ echo $IGT_TEST_DESCRIPTION
+ exit $IGT_EXIT_SUCCESS
+ ;;
+ --help)
+ echo "Usage: `basename $0` [OPTIONS]"
+ echo " --list-subtests"
+ echo " --run-subtest <pattern>"
+ echo " --debug"
+ echo " --help-description"
+ echo " --help"
+ exit $IGT_EXIT_SUCCESS
+ ;;
+ esac
+done
diff --git a/tests/drm_lib.sh b/tests/drm_lib.sh
index 2ba146b..c32bc68 100755
--- a/tests/drm_lib.sh
+++ b/tests/drm_lib.sh
@@ -1,38 +1,7 @@
#!/bin/sh
-IGT_EXIT_TIMEOUT=78
-IGT_EXIT_SKIP=77
-IGT_EXIT_SUCCESS=0
-IGT_EXIT_INVALID=79
-IGT_EXIT_FAILURE=99
-
-# hacked-up long option parsing
-for arg in $@ ; do
- case $arg in
- --list-subtests)
- exit $IGT_EXIT_INVALID
- ;;
- --run-subtest)
- exit $IGT_EXIT_INVALID
- ;;
- --debug)
- IGT_LOG_LEVEL=debug
- ;;
- --help-description)
- echo $IGT_TEST_DESCRIPTION
- exit $IGT_EXIT_SUCCESS
- ;;
- --help)
- echo "Usage: `basename $0` [OPTIONS]"
- echo " --list-subtests"
- echo " --run-subtest <pattern>"
- echo " --debug"
- echo " --help-description"
- echo " --help"
- exit $IGT_EXIT_SUCCESS
- ;;
- esac
-done
+SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
+. $SOURCE_DIR/drm_getopt.sh
skip() {
echo "$@"
diff --git a/tests/vgem_reload_basic b/tests/vgem_reload_basic
index b150b2c..a42da70 100755
--- a/tests/vgem_reload_basic
+++ b/tests/vgem_reload_basic
@@ -5,6 +5,9 @@
# ... we've broken this way too often :(
#
+SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
+. $SOURCE_DIR/drm_getopt.sh
+
function unload() {
/sbin/rmmod vgem
# drm may be used by other devices (nouveau, radeon, udl, etc)
--
2.8.1
More information about the Intel-gfx
mailing list