[igt-dev] [PATCH i-g-t v2 0/4] run-tests.sh improvements

[igt-dev] [PATCH i-g-t v2 0/4] run-tests.sh improvements

[Lucas De Marchi]

Changes since v1:
    - Make sure it works with and without sudo
    - Add patch to README with a comment about tests vs selfchecks
    - Add patch to allow run-tests.sh to be used with a meson build
      without needing environment vars

Lucas De Marchi (4):
  run-tests.sh: allow to run without sudo
  run-tests.sh: allow relative IGT_TEST_ROOT and IGT_CONFIG_PATH
  README: clarify comment about tests
  run-tests.sh: use meson build by default

 README               |  5 ++++-
 scripts/run-tests.sh | 45 ++++++++++++++++++++++++++++++++++-----------
 2 files changed, 38 insertions(+), 12 deletions(-)

-- 
2.14.3

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

[igt-dev] [PATCH i-g-t v2 1/4] run-tests.sh: allow to run without sudo

[Lucas De Marchi]

If the script is already running as root, it doens't need to be
executed through sudo. This also moves the calls to exec piglit to a
common function.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
 scripts/run-tests.sh | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh
index a98e06ce..1c3f2805 100755
--- a/scripts/run-tests.sh
+++ b/scripts/run-tests.sh
@@ -44,6 +44,21 @@ function download_piglit {
 	git clone git://anongit.freedesktop.org/piglit "$ROOT/piglit"
 }
 
+function run_piglit # as-root <args>
+{
+	local need_root=$1
+	shift
+	local sudo
+
+	export IGT_TEST_ROOT IGT_CONFIG_PATH
+
+	if [ "$need_root" -ne 0 -a "$EUID" -ne 0 ]; then
+		sudo="sudo --preserve-env=IGT_TEST_ROOT,IGT_CONFIG_PATH"
+	fi
+
+	$sudo $PIGLIT "$@"
+}
+
 function print_help {
 	echo "Usage: run-tests.sh [options]"
 	echo "Available options:"
@@ -111,18 +126,18 @@ if [ ! -x "$PIGLIT" ]; then
 fi
 
 if [ "x$LIST_TESTS" != "x" ]; then
-	IGT_TEST_ROOT="$IGT_TEST_ROOT" IGT_CONFIG_PATH="$IGT_CONFIG_PATH" "$PIGLIT" print-cmd --format "{name}" igt
+	run_piglit 0 print-cmd --format "{name}" igt
 	exit
 fi
 
 if [ "x$RESUME" != "x" ]; then
-	sudo IGT_TEST_ROOT="$IGT_TEST_ROOT" IGT_CONFIG_PATH="$IGT_CONFIG_PATH" "$PIGLIT" resume "$RESULTS" $NORETRY
+	run_piglit 1 resume "$RESULTS" $NORETRY
 else
 	mkdir -p "$RESULTS"
-	sudo IGT_TEST_ROOT="$IGT_TEST_ROOT" IGT_CONFIG_PATH="$IGT_CONFIG_PATH" "$PIGLIT" run igt --ignore-missing -o "$RESULTS" -s $VERBOSE $EXCLUDE $FILTER
+	run_piglit 1 run igt --ignore-missing -o "$RESULTS" -s $VERBOSE $EXCLUDE $FILTER
 fi
 
 if [ "$SUMMARY" == "html" ]; then
-	"$PIGLIT" summary html --overwrite "$RESULTS/html" "$RESULTS"
+	run_piglit 0 summary html --overwrite "$RESULTS/html" "$RESULTS"
 	echo "HTML summary has been written to $RESULTS/html/index.html"
 fi
-- 
2.14.3

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

[igt-dev] [PATCH i-g-t v2 2/4] run-tests.sh: allow relative IGT_TEST_ROOT and IGT_CONFIG_PATH

[Lucas De Marchi]

When piglit runs it chdir() to its own directory, so passing a relative
path doesn't work. E.g.:

	Fatal Error: IGT directory does not exist. Missing: build/tests

Make sure path is absolute throughout the script.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
 scripts/run-tests.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh
index 1c3f2805..230250dd 100755
--- a/scripts/run-tests.sh
+++ b/scripts/run-tests.sh
@@ -24,8 +24,8 @@
 
 ROOT="`dirname $0`"
 ROOT="`readlink -f $ROOT/..`"
-IGT_TEST_ROOT="${IGT_TEST_ROOT:-$ROOT/tests}"
-IGT_CONFIG_PATH="${IGT_CONFIG_PATH:-$HOME/.igtrc}"
+IGT_TEST_ROOT="`readlink -f ${IGT_TEST_ROOT:-$ROOT/tests}`"
+IGT_CONFIG_PATH="`readlink -f ${IGT_CONFIG_PATH:-$HOME/.igtrc}`"
 RESULTS="$ROOT/results"
 PIGLIT=`which piglit 2> /dev/null`
 
-- 
2.14.3

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

[igt-dev] [PATCH i-g-t v2 3/4] README: clarify comment about tests

[Lucas De Marchi]

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
 README | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README b/README
index 7cd78e44..82c1cad5 100644
--- a/README
+++ b/README
@@ -177,10 +177,13 @@ $ mkdir build && meson build && cd build && ninja
 
 Note that meson insist on separate build directories from the source tree.
 
-Running testcases is done with
+Running selfchecks for lib/tests and tests/ is done with
 
 $ cd build && ninja test
 
+Note that this doesn't actually run the testcases in tests/: scripts/run-tests.sh
+should continue to be used for that.
+
 Documentation is built using
 
 $ cd build && ninja && ninja intel-gpu-tools-doc
-- 
2.14.3

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

[igt-dev] [PATCH i-g-t v2 4/4] run-tests.sh: use meson build by default

[Lucas De Marchi]

This makes scripts/run-tests.sh to look into a build dir by default,
looking for the test lists. With this we can run the script after
building i-g-t with meson without having to resort to the environment
variable.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
 scripts/run-tests.sh | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh
index 230250dd..fe153934 100755
--- a/scripts/run-tests.sh
+++ b/scripts/run-tests.sh
@@ -24,22 +24,30 @@
 
 ROOT="`dirname $0`"
 ROOT="`readlink -f $ROOT/..`"
-IGT_TEST_ROOT="`readlink -f ${IGT_TEST_ROOT:-$ROOT/tests}`"
 IGT_CONFIG_PATH="`readlink -f ${IGT_CONFIG_PATH:-$HOME/.igtrc}`"
 RESULTS="$ROOT/results"
 PIGLIT=`which piglit 2> /dev/null`
 
-if [ ! -d "$IGT_TEST_ROOT" ]; then
-	echo "Error: could not find tests directory."
-	exit 1
+if [ -z "$IGT_TEST_ROOT" ]; then
+	paths=("$ROOT/build/tests/test-list.txt"
+	       "$ROOT/tests/test-list.txt")
+	for p in "${paths[@]}"; do
+		if [ -f "$p" ]; then
+			echo "Found test list: \"$p\""
+			IGT_TEST_ROOT=$(dirname "$p")
+			break
+		fi
+	done
 fi
 
-if [ ! -f "$IGT_TEST_ROOT/test-list.txt" ]; then
+if [ -z "$IGT_TEST_ROOT" ]; then
 	echo "Error: test list not found."
-	echo "Please run make in the tests directory to generate the test list."
+	echo "Please build tests to generate the test list or use IGT_TEST_ROOT env var."
 	exit 1
 fi
 
+IGT_TEST_ROOT="`readlink -f ${IGT_TEST_ROOT}`"
+
 function download_piglit {
 	git clone git://anongit.freedesktop.org/piglit "$ROOT/piglit"
 }
-- 
2.14.3

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

[igt-dev] ✓ Fi.CI.BAT: success for run-tests.sh improvements (rev2)

[Patchwork]

== Series Details ==

Series: run-tests.sh improvements (rev2)
URL   : https://patchwork.freedesktop.org/series/39021/
State : success

== Summary ==

IGT patchset tested on top of latest successful build
5c146fcff2d51ea426efc538599013e887fe456b tests/kms_pipe_crc_basic: Remove legacy crc tests

with latest DRM-Tip kernel build CI_DRM_3931
178cfb9373cc drm-tip: 2018y-03m-14d-21h-38m-09s UTC integration manifest

No testlist changes.

fi-bdw-5557u     total:285  pass:264  dwarn:0   dfail:0   fail:0   skip:21  time:435s
fi-bdw-gvtdvm    total:285  pass:261  dwarn:0   dfail:0   fail:0   skip:24  time:439s
fi-blb-e6850     total:285  pass:220  dwarn:1   dfail:0   fail:0   skip:64  time:387s
fi-bsw-n3050     total:285  pass:239  dwarn:0   dfail:0   fail:0   skip:46  time:535s
fi-bwr-2160      total:285  pass:180  dwarn:0   dfail:0   fail:0   skip:105 time:302s
fi-bxt-dsi       total:285  pass:255  dwarn:0   dfail:0   fail:0   skip:30  time:516s
fi-byt-j1900     total:285  pass:250  dwarn:0   dfail:0   fail:0   skip:35  time:518s
fi-byt-n2820     total:285  pass:246  dwarn:0   dfail:0   fail:0   skip:39  time:505s
fi-cfl-8700k     total:285  pass:257  dwarn:0   dfail:0   fail:0   skip:28  time:410s
fi-cfl-s2        total:285  pass:259  dwarn:0   dfail:0   fail:0   skip:26  time:579s
fi-cfl-u         total:285  pass:259  dwarn:0   dfail:0   fail:0   skip:26  time:511s
fi-elk-e7500     total:285  pass:226  dwarn:0   dfail:0   fail:0   skip:59  time:430s
fi-gdg-551       total:285  pass:176  dwarn:0   dfail:0   fail:1   skip:108 time:319s
fi-glk-1         total:285  pass:257  dwarn:0   dfail:0   fail:0   skip:28  time:540s
fi-hsw-4770      total:285  pass:258  dwarn:0   dfail:0   fail:0   skip:27  time:403s
fi-ilk-650       total:285  pass:225  dwarn:0   dfail:0   fail:0   skip:60  time:420s
fi-ivb-3520m     total:285  pass:256  dwarn:0   dfail:0   fail:0   skip:29  time:475s
fi-ivb-3770      total:285  pass:252  dwarn:0   dfail:0   fail:0   skip:33  time:432s
fi-kbl-7500u     total:285  pass:260  dwarn:1   dfail:0   fail:0   skip:24  time:477s
fi-kbl-7567u     total:285  pass:265  dwarn:0   dfail:0   fail:0   skip:20  time:468s
fi-kbl-r         total:285  pass:258  dwarn:0   dfail:0   fail:0   skip:27  time:515s
fi-pnv-d510      total:285  pass:219  dwarn:1   dfail:0   fail:0   skip:65  time:656s
fi-skl-6260u     total:285  pass:265  dwarn:0   dfail:0   fail:0   skip:20  time:439s
fi-skl-6600u     total:285  pass:258  dwarn:0   dfail:0   fail:0   skip:27  time:529s
fi-skl-6700hq    total:285  pass:259  dwarn:0   dfail:0   fail:0   skip:26  time:542s
fi-skl-6700k2    total:285  pass:261  dwarn:0   dfail:0   fail:0   skip:24  time:506s
fi-skl-6770hq    total:285  pass:265  dwarn:0   dfail:0   fail:0   skip:20  time:501s
fi-skl-guc       total:285  pass:257  dwarn:0   dfail:0   fail:0   skip:28  time:425s
fi-skl-gvtdvm    total:285  pass:262  dwarn:0   dfail:0   fail:0   skip:23  time:442s
fi-snb-2520m     total:285  pass:245  dwarn:0   dfail:0   fail:0   skip:40  time:569s
fi-snb-2600      total:285  pass:245  dwarn:0   dfail:0   fail:0   skip:40  time:406s
Blacklisted hosts:
fi-cnl-drrs      total:285  pass:254  dwarn:3   dfail:0   fail:0   skip:28  time:518s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1129/issues.html
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

[igt-dev] ✗ Fi.CI.IGT: warning for run-tests.sh improvements (rev2)

[Patchwork]

== Series Details ==

Series: run-tests.sh improvements (rev2)
URL   : https://patchwork.freedesktop.org/series/39021/
State : warning

== Summary ==

---- Possible new issues:

Test kms_cursor_crc:
        Subgroup cursor-128x128-suspend:
                pass       -> SKIP       (shard-snb)
Test kms_frontbuffer_tracking:
        Subgroup fbc-1p-primscrn-pri-shrfb-draw-render:
                fail       -> PASS       (shard-apl)

---- Known issues:

Test kms_flip:
        Subgroup flip-vs-expired-vblank-interruptible:
                fail       -> PASS       (shard-hsw) fdo#102887
Test kms_rotation_crc:
        Subgroup sprite-rotation-180:
                pass       -> FAIL       (shard-snb) fdo#105185

fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#105185 https://bugs.freedesktop.org/show_bug.cgi?id=105185

shard-apl        total:3345 pass:1759 dwarn:1   dfail:0   fail:7   skip:1577 time:12628s
shard-hsw        total:3441 pass:1767 dwarn:1   dfail:0   fail:1   skip:1671 time:11949s
shard-snb        total:3441 pass:1355 dwarn:1   dfail:0   fail:3   skip:2082 time:7180s
Blacklisted hosts:
shard-kbl        total:3301 pass:1833 dwarn:22  dfail:0   fail:8   skip:1435 time:8780s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1129/shards.html
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [PATCH i-g-t v2 1/4] run-tests.sh: allow to run without sudo

[Petri Latvala]

On Wed, Mar 14, 2018 at 05:59:07PM -0700, Lucas De Marchi wrote:
> If the script is already running as root, it doens't need to be
                                                 ^^^^^ typo


> executed through sudo. This also moves the calls to exec piglit to a
> common function.
> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>


Reviewed-by: Petri Latvala <petri.latvala@intel.com>



> ---
>  scripts/run-tests.sh | 23 +++++++++++++++++++----
>  1 file changed, 19 insertions(+), 4 deletions(-)
> 
> diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh
> index a98e06ce..1c3f2805 100755
> --- a/scripts/run-tests.sh
> +++ b/scripts/run-tests.sh
> @@ -44,6 +44,21 @@ function download_piglit {
>  	git clone git://anongit.freedesktop.org/piglit "$ROOT/piglit"
>  }
>  
> +function run_piglit # as-root <args>
> +{
> +	local need_root=$1
> +	shift
> +	local sudo
> +
> +	export IGT_TEST_ROOT IGT_CONFIG_PATH
> +
> +	if [ "$need_root" -ne 0 -a "$EUID" -ne 0 ]; then
> +		sudo="sudo --preserve-env=IGT_TEST_ROOT,IGT_CONFIG_PATH"
> +	fi
> +
> +	$sudo $PIGLIT "$@"
> +}
> +
>  function print_help {
>  	echo "Usage: run-tests.sh [options]"
>  	echo "Available options:"
> @@ -111,18 +126,18 @@ if [ ! -x "$PIGLIT" ]; then
>  fi
>  
>  if [ "x$LIST_TESTS" != "x" ]; then
> -	IGT_TEST_ROOT="$IGT_TEST_ROOT" IGT_CONFIG_PATH="$IGT_CONFIG_PATH" "$PIGLIT" print-cmd --format "{name}" igt
> +	run_piglit 0 print-cmd --format "{name}" igt
>  	exit
>  fi
>  
>  if [ "x$RESUME" != "x" ]; then
> -	sudo IGT_TEST_ROOT="$IGT_TEST_ROOT" IGT_CONFIG_PATH="$IGT_CONFIG_PATH" "$PIGLIT" resume "$RESULTS" $NORETRY
> +	run_piglit 1 resume "$RESULTS" $NORETRY
>  else
>  	mkdir -p "$RESULTS"
> -	sudo IGT_TEST_ROOT="$IGT_TEST_ROOT" IGT_CONFIG_PATH="$IGT_CONFIG_PATH" "$PIGLIT" run igt --ignore-missing -o "$RESULTS" -s $VERBOSE $EXCLUDE $FILTER
> +	run_piglit 1 run igt --ignore-missing -o "$RESULTS" -s $VERBOSE $EXCLUDE $FILTER
>  fi
>  
>  if [ "$SUMMARY" == "html" ]; then
> -	"$PIGLIT" summary html --overwrite "$RESULTS/html" "$RESULTS"
> +	run_piglit 0 summary html --overwrite "$RESULTS/html" "$RESULTS"
>  	echo "HTML summary has been written to $RESULTS/html/index.html"
>  fi
> -- 
> 2.14.3
> 
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [PATCH i-g-t v2 2/4] run-tests.sh: allow relative IGT_TEST_ROOT and IGT_CONFIG_PATH

[Petri Latvala]

On Wed, Mar 14, 2018 at 05:59:08PM -0700, Lucas De Marchi wrote:
> When piglit runs it chdir() to its own directory, so passing a relative
> path doesn't work. E.g.:
> 
> 	Fatal Error: IGT directory does not exist. Missing: build/tests
> 
> Make sure path is absolute throughout the script.
> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

Reviewed-by: Petri Latvala <petri.latvala@intel.com>


> ---
>  scripts/run-tests.sh | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh
> index 1c3f2805..230250dd 100755
> --- a/scripts/run-tests.sh
> +++ b/scripts/run-tests.sh
> @@ -24,8 +24,8 @@
>  
>  ROOT="`dirname $0`"
>  ROOT="`readlink -f $ROOT/..`"
> -IGT_TEST_ROOT="${IGT_TEST_ROOT:-$ROOT/tests}"
> -IGT_CONFIG_PATH="${IGT_CONFIG_PATH:-$HOME/.igtrc}"
> +IGT_TEST_ROOT="`readlink -f ${IGT_TEST_ROOT:-$ROOT/tests}`"
> +IGT_CONFIG_PATH="`readlink -f ${IGT_CONFIG_PATH:-$HOME/.igtrc}`"
>  RESULTS="$ROOT/results"
>  PIGLIT=`which piglit 2> /dev/null`
>  
> -- 
> 2.14.3
> 
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [PATCH i-g-t v2 3/4] README: clarify comment about tests

[Petri Latvala]

On Wed, Mar 14, 2018 at 05:59:09PM -0700, Lucas De Marchi wrote:
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> ---
>  README | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/README b/README
> index 7cd78e44..82c1cad5 100644
> --- a/README
> +++ b/README
> @@ -177,10 +177,13 @@ $ mkdir build && meson build && cd build && ninja
>  
>  Note that meson insist on separate build directories from the source tree.
>  
> -Running testcases is done with
> +Running selfchecks for lib/tests and tests/ is done with


I don't think the locations of the selfchecks need to be listed
here. And the one selfcheck in tests/ (the command line handling
check) is there for legacy reasons anyway...

"Running IGT selfchecks is done with --"  ?


Either way,

Reviewed-by: Petri Latvala <petri.latvala@intel.com>


>  
>  $ cd build && ninja test
>  
> +Note that this doesn't actually run the testcases in tests/: scripts/run-tests.sh
> +should continue to be used for that.
> +
>  Documentation is built using
>  
>  $ cd build && ninja && ninja intel-gpu-tools-doc
> -- 
> 2.14.3
> 
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [PATCH i-g-t v2 4/4] run-tests.sh: use meson build by default

[Petri Latvala]

On Wed, Mar 14, 2018 at 05:59:10PM -0700, Lucas De Marchi wrote:
> This makes scripts/run-tests.sh to look into a build dir by default,
> looking for the test lists. With this we can run the script after
> building i-g-t with meson without having to resort to the environment
> variable.
> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> ---
>  scripts/run-tests.sh | 20 ++++++++++++++------
>  1 file changed, 14 insertions(+), 6 deletions(-)
> 
> diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh
> index 230250dd..fe153934 100755
> --- a/scripts/run-tests.sh
> +++ b/scripts/run-tests.sh
> @@ -24,22 +24,30 @@
>  
>  ROOT="`dirname $0`"
>  ROOT="`readlink -f $ROOT/..`"
> -IGT_TEST_ROOT="`readlink -f ${IGT_TEST_ROOT:-$ROOT/tests}`"
>  IGT_CONFIG_PATH="`readlink -f ${IGT_CONFIG_PATH:-$HOME/.igtrc}`"
>  RESULTS="$ROOT/results"
>  PIGLIT=`which piglit 2> /dev/null`
>  
> -if [ ! -d "$IGT_TEST_ROOT" ]; then
> -	echo "Error: could not find tests directory."
> -	exit 1
> +if [ -z "$IGT_TEST_ROOT" ]; then
> +	paths=("$ROOT/build/tests/test-list.txt"
> +	       "$ROOT/tests/test-list.txt")
> +	for p in "${paths[@]}"; do
> +		if [ -f "$p" ]; then
> +			echo "Found test list: \"$p\""


I was first going to complain about printing too much crap but it's of
course useful to know which one the script selected now that it's
looking in multiple places.

Reviewed-by: Petri Latvala <petri.latvala@intel.com>


> +			IGT_TEST_ROOT=$(dirname "$p")
> +			break
> +		fi
> +	done
>  fi
>  
> -if [ ! -f "$IGT_TEST_ROOT/test-list.txt" ]; then
> +if [ -z "$IGT_TEST_ROOT" ]; then
>  	echo "Error: test list not found."
> -	echo "Please run make in the tests directory to generate the test list."
> +	echo "Please build tests to generate the test list or use IGT_TEST_ROOT env var."
>  	exit 1
>  fi
>  
> +IGT_TEST_ROOT="`readlink -f ${IGT_TEST_ROOT}`"
> +
>  function download_piglit {
>  	git clone git://anongit.freedesktop.org/piglit "$ROOT/piglit"
>  }
> -- 
> 2.14.3
> 
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [PATCH i-g-t v2 0/4] run-tests.sh improvements

[Arkadiusz Hiler]

On Wed, Mar 14, 2018 at 05:59:06PM -0700, Lucas De Marchi wrote:
> Changes since v1:
>     - Make sure it works with and without sudo
>     - Add patch to README with a comment about tests vs selfchecks
>     - Add patch to allow run-tests.sh to be used with a meson build
>       without needing environment vars
> 
> Lucas De Marchi (4):
>   run-tests.sh: allow to run without sudo
>   run-tests.sh: allow relative IGT_TEST_ROOT and IGT_CONFIG_PATH
>   README: clarify comment about tests
>   run-tests.sh: use meson build by default
> 
>  README               |  5 ++++-
>  scripts/run-tests.sh | 45 ++++++++++++++++++++++++++++++++++-----------
>  2 files changed, 38 insertions(+), 12 deletions(-)

Whole thing:
Acked-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [PATCH i-g-t v2 4/4] run-tests.sh: use meson build by default

[Lucas De Marchi]

On Thu, Mar 15, 2018 at 4:50 AM, Petri Latvala <petri.latvala@intel.com> wrote:
> On Wed, Mar 14, 2018 at 05:59:10PM -0700, Lucas De Marchi wrote:
>> This makes scripts/run-tests.sh to look into a build dir by default,
>> looking for the test lists. With this we can run the script after
>> building i-g-t with meson without having to resort to the environment
>> variable.
>>
>> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
>> ---
>>  scripts/run-tests.sh | 20 ++++++++++++++------
>>  1 file changed, 14 insertions(+), 6 deletions(-)
>>
>> diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh
>> index 230250dd..fe153934 100755
>> --- a/scripts/run-tests.sh
>> +++ b/scripts/run-tests.sh
>> @@ -24,22 +24,30 @@
>>
>>  ROOT="`dirname $0`"
>>  ROOT="`readlink -f $ROOT/..`"
>> -IGT_TEST_ROOT="`readlink -f ${IGT_TEST_ROOT:-$ROOT/tests}`"
>>  IGT_CONFIG_PATH="`readlink -f ${IGT_CONFIG_PATH:-$HOME/.igtrc}`"
>>  RESULTS="$ROOT/results"
>>  PIGLIT=`which piglit 2> /dev/null`
>>
>> -if [ ! -d "$IGT_TEST_ROOT" ]; then
>> -     echo "Error: could not find tests directory."
>> -     exit 1
>> +if [ -z "$IGT_TEST_ROOT" ]; then
>> +     paths=("$ROOT/build/tests/test-list.txt"
>> +            "$ROOT/tests/test-list.txt")
>> +     for p in "${paths[@]}"; do
>> +             if [ -f "$p" ]; then
>> +                     echo "Found test list: \"$p\""
>
>
> I was first going to complain about printing too much crap but it's of
> course useful to know which one the script selected now that it's
> looking in multiple places.

yep, I didn't have the print and added it later as I found it useful.


> Reviewed-by: Petri Latvala <petri.latvala@intel.com>

thanks.
Btw, friendly ping on getting this applied.


Lucas De Marchi


>
>
>> +                     IGT_TEST_ROOT=$(dirname "$p")
>> +                     break
>> +             fi
>> +     done
>>  fi
>>
>> -if [ ! -f "$IGT_TEST_ROOT/test-list.txt" ]; then
>> +if [ -z "$IGT_TEST_ROOT" ]; then
>>       echo "Error: test list not found."
>> -     echo "Please run make in the tests directory to generate the test list."
>> +     echo "Please build tests to generate the test list or use IGT_TEST_ROOT env var."
>>       exit 1
>>  fi
>>
>> +IGT_TEST_ROOT="`readlink -f ${IGT_TEST_ROOT}`"
>> +
>>  function download_piglit {
>>       git clone git://anongit.freedesktop.org/piglit "$ROOT/piglit"
>>  }
>> --
>> 2.14.3
>>
> _______________________________________________
> igt-dev mailing list
> igt-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev



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

Re: [igt-dev] [PATCH i-g-t v2 4/4] run-tests.sh: use meson build by default

[Petri Latvala]

On Tue, Mar 20, 2018 at 02:45:44PM -0700, Lucas De Marchi wrote:
> On Thu, Mar 15, 2018 at 4:50 AM, Petri Latvala <petri.latvala@intel.com> wrote:
> > On Wed, Mar 14, 2018 at 05:59:10PM -0700, Lucas De Marchi wrote:
> >> This makes scripts/run-tests.sh to look into a build dir by default,
> >> looking for the test lists. With this we can run the script after
> >> building i-g-t with meson without having to resort to the environment
> >> variable.
> >>
> >> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> >> ---
> >>  scripts/run-tests.sh | 20 ++++++++++++++------
> >>  1 file changed, 14 insertions(+), 6 deletions(-)
> >>
> >> diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh
> >> index 230250dd..fe153934 100755
> >> --- a/scripts/run-tests.sh
> >> +++ b/scripts/run-tests.sh
> >> @@ -24,22 +24,30 @@
> >>
> >>  ROOT="`dirname $0`"
> >>  ROOT="`readlink -f $ROOT/..`"
> >> -IGT_TEST_ROOT="`readlink -f ${IGT_TEST_ROOT:-$ROOT/tests}`"
> >>  IGT_CONFIG_PATH="`readlink -f ${IGT_CONFIG_PATH:-$HOME/.igtrc}`"
> >>  RESULTS="$ROOT/results"
> >>  PIGLIT=`which piglit 2> /dev/null`
> >>
> >> -if [ ! -d "$IGT_TEST_ROOT" ]; then
> >> -     echo "Error: could not find tests directory."
> >> -     exit 1
> >> +if [ -z "$IGT_TEST_ROOT" ]; then
> >> +     paths=("$ROOT/build/tests/test-list.txt"
> >> +            "$ROOT/tests/test-list.txt")
> >> +     for p in "${paths[@]}"; do
> >> +             if [ -f "$p" ]; then
> >> +                     echo "Found test list: \"$p\""
> >
> >
> > I was first going to complain about printing too much crap but it's of
> > course useful to know which one the script selected now that it's
> > looking in multiple places.
> 
> yep, I didn't have the print and added it later as I found it useful.
> 
> 
> > Reviewed-by: Petri Latvala <petri.latvala@intel.com>
> 
> thanks.
> Btw, friendly ping on getting this applied.


Merged, thanks for the ping.

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

Re: [igt-dev] [PATCH i-g-t v2 1/4] run-tests.sh: allow to run without sudo

[Jani Nikula]

On Wed, 14 Mar 2018, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
> If the script is already running as root, it doens't need to be
> executed through sudo. This also moves the calls to exec piglit to a
> common function.
>
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> ---
>  scripts/run-tests.sh | 23 +++++++++++++++++++----
>  1 file changed, 19 insertions(+), 4 deletions(-)
>
> diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh
> index a98e06ce..1c3f2805 100755
> --- a/scripts/run-tests.sh
> +++ b/scripts/run-tests.sh
> @@ -44,6 +44,21 @@ function download_piglit {
>  	git clone git://anongit.freedesktop.org/piglit "$ROOT/piglit"
>  }
>  
> +function run_piglit # as-root <args>
> +{
> +	local need_root=$1
> +	shift
> +	local sudo
> +
> +	export IGT_TEST_ROOT IGT_CONFIG_PATH
> +
> +	if [ "$need_root" -ne 0 -a "$EUID" -ne 0 ]; then
> +		sudo="sudo --preserve-env=IGT_TEST_ROOT,IGT_CONFIG_PATH"
> +	fi

sudo: option '--preserve-env' doesn't allow an argument

$ sudo --version
Sudo version 1.8.19p1

BR,
Jani.

> +
> +	$sudo $PIGLIT "$@"
> +}
> +
>  function print_help {
>  	echo "Usage: run-tests.sh [options]"
>  	echo "Available options:"
> @@ -111,18 +126,18 @@ if [ ! -x "$PIGLIT" ]; then
>  fi
>  
>  if [ "x$LIST_TESTS" != "x" ]; then
> -	IGT_TEST_ROOT="$IGT_TEST_ROOT" IGT_CONFIG_PATH="$IGT_CONFIG_PATH" "$PIGLIT" print-cmd --format "{name}" igt
> +	run_piglit 0 print-cmd --format "{name}" igt
>  	exit
>  fi
>  
>  if [ "x$RESUME" != "x" ]; then
> -	sudo IGT_TEST_ROOT="$IGT_TEST_ROOT" IGT_CONFIG_PATH="$IGT_CONFIG_PATH" "$PIGLIT" resume "$RESULTS" $NORETRY
> +	run_piglit 1 resume "$RESULTS" $NORETRY
>  else
>  	mkdir -p "$RESULTS"
> -	sudo IGT_TEST_ROOT="$IGT_TEST_ROOT" IGT_CONFIG_PATH="$IGT_CONFIG_PATH" "$PIGLIT" run igt --ignore-missing -o "$RESULTS" -s $VERBOSE $EXCLUDE $FILTER
> +	run_piglit 1 run igt --ignore-missing -o "$RESULTS" -s $VERBOSE $EXCLUDE $FILTER
>  fi
>  
>  if [ "$SUMMARY" == "html" ]; then
> -	"$PIGLIT" summary html --overwrite "$RESULTS/html" "$RESULTS"
> +	run_piglit 0 summary html --overwrite "$RESULTS/html" "$RESULTS"
>  	echo "HTML summary has been written to $RESULTS/html/index.html"
>  fi

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [PATCH i-g-t v2 1/4] run-tests.sh: allow to run without sudo

[Lucas De Marchi]

On Fri, Apr 20, 2018 at 02:00:30PM +0300, Jani Nikula wrote:
> On Wed, 14 Mar 2018, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
> > If the script is already running as root, it doens't need to be
> > executed through sudo. This also moves the calls to exec piglit to a
> > common function.
> >
> > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> > ---
> >  scripts/run-tests.sh | 23 +++++++++++++++++++----
> >  1 file changed, 19 insertions(+), 4 deletions(-)
> >
> > diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh
> > index a98e06ce..1c3f2805 100755
> > --- a/scripts/run-tests.sh
> > +++ b/scripts/run-tests.sh
> > @@ -44,6 +44,21 @@ function download_piglit {
> >  	git clone git://anongit.freedesktop.org/piglit "$ROOT/piglit"
> >  }
> >  
> > +function run_piglit # as-root <args>
> > +{
> > +	local need_root=$1
> > +	shift
> > +	local sudo
> > +
> > +	export IGT_TEST_ROOT IGT_CONFIG_PATH
> > +
> > +	if [ "$need_root" -ne 0 -a "$EUID" -ne 0 ]; then
> > +		sudo="sudo --preserve-env=IGT_TEST_ROOT,IGT_CONFIG_PATH"
> > +	fi
> 
> sudo: option '--preserve-env' doesn't allow an argument
> 
> $ sudo --version
> Sudo version 1.8.19p1

This has been added on 1.8.21:
https://www.sudo.ws/stable.html#1.8.21

	The --preserve-env command line option has been extended to
	accept a comma-separated list of environment variables to
	preserve.

I didn't know it was that new. So for compatibility purposes maybe it's
better to do:
sudo="sudo  <options> IGT_TEST_ROOT=$IGT_TEST_ROOT ... <cmd>"

Lucas De Marchi

> 
> BR,
> Jani.
> 
> > +
> > +	$sudo $PIGLIT "$@"
> > +}
> > +
> >  function print_help {
> >  	echo "Usage: run-tests.sh [options]"
> >  	echo "Available options:"
> > @@ -111,18 +126,18 @@ if [ ! -x "$PIGLIT" ]; then
> >  fi
> >  
> >  if [ "x$LIST_TESTS" != "x" ]; then
> > -	IGT_TEST_ROOT="$IGT_TEST_ROOT" IGT_CONFIG_PATH="$IGT_CONFIG_PATH" "$PIGLIT" print-cmd --format "{name}" igt
> > +	run_piglit 0 print-cmd --format "{name}" igt
> >  	exit
> >  fi
> >  
> >  if [ "x$RESUME" != "x" ]; then
> > -	sudo IGT_TEST_ROOT="$IGT_TEST_ROOT" IGT_CONFIG_PATH="$IGT_CONFIG_PATH" "$PIGLIT" resume "$RESULTS" $NORETRY
> > +	run_piglit 1 resume "$RESULTS" $NORETRY
> >  else
> >  	mkdir -p "$RESULTS"
> > -	sudo IGT_TEST_ROOT="$IGT_TEST_ROOT" IGT_CONFIG_PATH="$IGT_CONFIG_PATH" "$PIGLIT" run igt --ignore-missing -o "$RESULTS" -s $VERBOSE $EXCLUDE $FILTER
> > +	run_piglit 1 run igt --ignore-missing -o "$RESULTS" -s $VERBOSE $EXCLUDE $FILTER
> >  fi
> >  
> >  if [ "$SUMMARY" == "html" ]; then
> > -	"$PIGLIT" summary html --overwrite "$RESULTS/html" "$RESULTS"
> > +	run_piglit 0 summary html --overwrite "$RESULTS/html" "$RESULTS"
> >  	echo "HTML summary has been written to $RESULTS/html/index.html"
> >  fi
> 
> -- 
> Jani Nikula, Intel Open Source Technology Center
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev