On 24/10/17 15:18, Arkadiusz Hiler wrote:
On Tue, Oct 24, 2017 at 01:40:21PM +0300, Petri Latvala wrote:
List the available tests with piglit instead of by hand. This solves
naming inconsistencies (piglit throwing caps away) as seen by
cibuglog, and makes the listing code simpler.
The format of the listing changes from
test-binary/subtest-name
to
igt@test-binary@subtest-name
The exact conversion is currently done by CI scripts as well.
Judging from the substitution I think this will end up as igt@igt@...
Let's see in which funny way this will blow up and then let's fix it.
Acked-by: Arkadiusz Hiler <arkadiusz.hiler@xxxxxxxxx>
But please come talk to Tomi and me before merging this :-)
Already fixed in the scripts (not extensively tested, though..)
They can eat either format (test/subtest or igt@test@subtest).
Tomi
but so far nothing has been able to directly consume run-tests.sh -l
output. The piglit format is directly consumable by piglit --test-list, and thus
by run-tests.sh -T.
Signed-off-by: Petri Latvala <petri.latvala@xxxxxxxxx>
Cc: Tomi Sarvela <tomi.p.sarvela@xxxxxxxxx>
Cc: Arkadiusz Hiler <arkadiusz.hiler@xxxxxxxxx>
---
This patch cannot be merged without explicit confirmation from Tomi
and Arek that the CI side is ready for this. Today, this will break
sharded runs.
scripts/run-tests.sh | 22 ++++++----------------
1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh
index a28dd876..acd2ae2f 100755
--- a/scripts/run-tests.sh
+++ b/scripts/run-tests.sh
@@ -40,8 +40,6 @@ if [ ! -f "$IGT_TEST_ROOT/test-list.txt" ]; then
exit 1
fi
-TEST_LIST=`cat "$IGT_TEST_ROOT/test-list.txt" | sed -e '/TESTLIST/d' -e 's/ /\n/g'`
-
function download_piglit {
git clone git://anongit.freedesktop.org/piglit "$ROOT/piglit"
}
@@ -70,24 +68,11 @@ function print_help {
echo "Useful patterns for test filtering are described in the API documentation."
}
-function list_tests {
- for test in $TEST_LIST; do
- SUBTESTS=`"$IGT_TEST_ROOT/$test" --list-subtests`
- if [ -z "$SUBTESTS" ]; then
- echo "$test"
- else
- for subtest in $SUBTESTS; do
- echo "$test/$subtest"
- done
- fi
- done
-}
-
while getopts ":dhlr:st:T:vx:Rn" opt; do
case $opt in
d) download_piglit; exit ;;
h) print_help; exit ;;
- l) list_tests; exit ;;
+ l) LIST_TESTS="true" ;;
r) RESULTS="$OPTARG" ;;
s) SUMMARY="html" ;;
t) FILTER="$FILTER -t $OPTARG" ;;
@@ -125,6 +110,11 @@ if [ ! -x "$PIGLIT" ]; then
exit 1
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
+ exit
+fi
+
if [ "x$RESUME" != "x" ]; then
sudo IGT_TEST_ROOT="$IGT_TEST_ROOT" IGT_CONFIG_PATH="$IGT_CONFIG_PATH" "$PIGLIT" resume "$RESULTS" $NORETRY
else
--
2.14.1
Tomi
--
Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
