| Message ID | 1508841621-21545-1-git-send-email-petri.latvala@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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@intel.com> But please come talk to Tomi and me before merging this :-) > 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@intel.com> > Cc: Tomi Sarvela <tomi.p.sarvela@intel.com> > Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com> > --- > > 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 >
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@intel.com> > > 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@intel.com> >> Cc: Tomi Sarvela <tomi.p.sarvela@intel.com> >> Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com> >> --- >> >> 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
On Mon, Oct 30, 2017 at 09:40:14AM +0000, Patchwork wrote: > == Series Details == > > Series: run-tests.sh: Use piglit names when listing available tests > URL : https://patchwork.freedesktop.org/series/32527/ > State : success > > == Summary == > > IGT patchset tested on top of latest successful build > 1fc4de1ca390adec9be8bd7cc0c36cab07465959 igt/gem_exec_latency: Wire up an interloper for preemption > > with latest DRM-Tip kernel build CI_DRM_3292 > d0582552491e drm-tip: 2017y-10m-27d-19h-16m-21s UTC integration manifest > > Testlist changes: > +igt@gem_concurrent_blit@1mib-full-cpu-blt-early-read > +igt@gem_concurrent_blit@1mib-full-cpu-blt-early-read-bomb > +igt@gem_concurrent_blit@1mib-full-cpu-blt-early-read-child > +igt@gem_concurrent_blit@1mib-full-cpu-blt-early-read-forked > +igt@gem_concurrent_blit@1mib-full-cpu-blt-early-read-interruptible > +igt@gem_concurrent_blit@1mib-full-cpu-blt-gpu-read-after-write > +igt@gem_concurrent_blit@1mib-full-cpu-blt-gpu-read-after-write-bomb > +igt@gem_concurrent_blit@1mib-full-cpu-blt-gpu-read-after-write-child > +igt@gem_concurrent_blit@1mib-full-cpu-blt-gpu-read-after-write-forked > +igt@gem_concurrent_blit@1mib-full-cpu-blt-gpu-read-after-write-interruptible > +igt@gem_concurrent_blit@1mib-full-cpu-blt-intermix-bcs > +igt@gem_concurrent_blit@1mib-full-cpu-blt-intermix-bcs-bomb > +igt@gem_concurrent_blit@1mib-full-cpu-blt-intermix-bcs-child > +igt@gem_concurrent_blit@1mib-full-cpu-blt-intermix-bcs-forked > +igt@gem_concurrent_blit@1mib-full-cpu-blt-intermix-bcs-interruptible > +igt@gem_concurrent_blit@1mib-full-cpu-blt-intermix-both > +igt@gem_concurrent_blit@1mib-full-cpu-blt-intermix-both-bomb > +igt@gem_concurrent_blit@1mib-full-cpu-blt-intermix-both-child > +igt@gem_concurrent_blit@1mib-full-cpu-blt-intermix-both-forked > +igt@gem_concurrent_blit@1mib-full-cpu-blt-intermix-both-interruptible > +igt@gem_concurrent_blit@1mib-full-cpu-blt-intermix-rcs > +igt@gem_concurrent_blit@1mib-full-cpu-blt-intermix-rcs-bomb > +igt@gem_concurrent_blit@1mib-full-cpu-blt-intermix-rcs-child > +igt@gem_concurrent_blit@1mib-full-cpu-blt-intermix-rcs-forked > +igt@gem_concurrent_blit@1mib-full-cpu-blt-intermix-rcs-interruptible > +igt@gem_concurrent_blit@1mib-full-cpu-blt-overwrite-source > +igt@gem_concurrent_blit@1mib-full-cpu-blt-overwrite-source-bomb > +igt@gem_concurrent_blit@1mib-full-cpu-blt-overwrite-source-child > +igt@gem_concurrent_blit@1mib-full-cpu-blt-overwrite-source-forked > +igt@gem_concurrent_blit@1mib-full-cpu-blt-overwrite-source-interruptible > +igt@gem_concurrent_blit@1mib-full-cpu-blt-overwrite-source-one > +igt@gem_concurrent_blit@1mib-full-cpu-blt-overwrite-source-one-bomb > +igt@gem_concurrent_blit@1mib-full-cpu-blt-overwrite-source-one-child > +igt@gem_concurrent_blit@1mib-full-cpu-blt-overwrite-source-one-forked > +igt@gem_concurrent_blit@1mib-full-cpu-blt-overwrite-source-one-interruptible > +igt@gem_concurrent_blit@1mib-full-cpu-blt-overwrite-source-read-bcs > +igt@gem_concurrent_blit@1mib-full-cpu-blt-overwrite-source-read-bcs-bomb > +igt@gem_concurrent_blit@1mib-full-cpu-blt-overwrite-source-read-bcs-child > +igt@gem_concurrent_blit@1mib-full-cpu-blt-overwrite-source-read-bcs-forked > +igt@gem_concurrent_blit@1mib-full-cpu-blt-overwrite-source-read-bcs-interruptible > +igt@gem_concurrent_blit@1mib-full-cpu-blt-overwrite-source-read-rcs > +igt@gem_concurrent_blit@1mib-full-cpu-blt-overwrite-source-read-rcs-bomb > +igt@gem_concurrent_blit@1mib-full-cpu-blt-overwrite-source-read-rcs-child > +igt@gem_concurrent_blit@1mib-full-cpu-blt-overwrite-source-read-rcs-forked > +igt@gem_concurrent_blit@1mib-full-cpu-blt-overwrite-source-read-rcs-interruptible > +igt@gem_concurrent_blit@1mib-full-cpu-blt-overwrite-source-rev > +igt@gem_concurrent_blit@1mib-full-cpu-blt-overwrite-source-rev-bomb > +igt@gem_concurrent_blit@1mib-full-cpu-blt-overwrite-source-rev-child > +igt@gem_concurrent_blit@1mib-full-cpu-blt-overwrite-source-rev-forked > +igt@gem_concurrent_blit@1mib-full-cpu-blt-overwrite-source-rev-interruptible > +igt@gem_concurrent_blit@1mib-full-cpu-blt-read-read-bcs > +igt@gem_concurrent_blit@1mib-full-cpu-blt-read-read-bcs-bomb > +igt@gem_concurrent_blit@1mib-full-cpu-blt-read-read-bcs-child > +igt@gem_concurrent_blit@1mib-full-cpu-blt-read-read-bcs-forked > +igt@gem_concurrent_blit@1mib-full-cpu-blt-read-read-bcs-interruptible > +igt@gem_concurrent_blit@1mib-full-cpu-blt-read-read-rcs > +igt@gem_concurrent_blit@1mib-full-cpu-blt-read-read-rcs-bomb > +igt@gem_concurrent_blit@1mib-full-cpu-blt-read-read-rcs-child > +igt@gem_concurrent_blit@1mib-full-cpu-blt-read-read-rcs-forked > +igt@gem_concurrent_blit@1mib-full-cpu-blt-read-read-rcs-interruptible > +igt@gem_concurrent_blit@1mib-full-cpu-blt-sanitycheck0 > +igt@gem_concurrent_blit@1mib-full-cpu-blt-sanitycheck0-bomb > +igt@gem_concurrent_blit@1mib-full-cpu-blt-sanitycheck0-child > +igt@gem_concurrent_blit@1mib-full-cpu-blt-sanitycheck0-forked > +igt@gem_concurrent_blit@1mib-full-cpu-blt-sanitycheck0-interruptible > +igt@gem_concurrent_blit@1mib-full-cpu-blt-sanitycheck1 > +igt@gem_concurrent_blit@1mib-full-cpu-blt-sanitycheck1-bomb > +igt@gem_concurrent_blit@1mib-full-cpu-blt-sanitycheck1-child > +igt@gem_concurrent_blit@1mib-full-cpu-blt-sanitycheck1-forked > +igt@gem_concurrent_blit@1mib-full-cpu-blt-sanitycheck1-interruptible > +igt@gem_concurrent_blit@1mib-full-cpu-blt-sanitycheckn > +igt@gem_concurrent_blit@1mib-full-cpu-blt-sanitycheckn-bomb > +igt@gem_concurrent_blit@1mib-full-cpu-blt-sanitycheckn-child > +igt@gem_concurrent_blit@1mib-full-cpu-blt-sanitycheckn-forked > +igt@gem_concurrent_blit@1mib-full-cpu-blt-sanitycheckn-interruptible > +igt@gem_concurrent_blit@1mib-full-cpu-blt-write-read-bcs > +igt@gem_concurrent_blit@1mib-full-cpu-blt-write-read-bcs-bomb > +igt@gem_concurrent_blit@1mib-full-cpu-blt-write-read-bcs-child > +igt@gem_concurrent_blit@1mib-full-cpu-blt-write-read-bcs-forked > +igt@gem_concurrent_blit@1mib-full-cpu-blt-write-read-bcs-interruptible > +igt@gem_concurrent_blit@1mib-full-cpu-blt-write-read-rcs > +igt@gem_concurrent_blit@1mib-full-cpu-blt-write-read-rcs-bomb > +igt@gem_concurrent_blit@1mib-full-cpu-blt-write-read-rcs-child > +igt@gem_concurrent_blit@1mib-full-cpu-blt-write-read-rcs-forked > +igt@gem_concurrent_blit@1mib-full-cpu-blt-write-read-rcs-interruptible > +igt@gem_concurrent_blit@1mib-full-cpu-render-early-read > +igt@gem_concurrent_blit@1mib-full-cpu-render-early-read-bomb > +igt@gem_concurrent_blit@1mib-full-cpu-render-early-read-child > +igt@gem_concurrent_blit@1mib-full-cpu-render-early-read-forked > +igt@gem_concurrent_blit@1mib-full-cpu-render-early-read-interruptible > +igt@gem_concurrent_blit@1mib-full-cpu-render-gpu-read-after-write > +igt@gem_concurrent_blit@1mib-full-cpu-render-gpu-read-after-write-bomb > +igt@gem_concurrent_blit@1mib-full-cpu-render-gpu-read-after-write-child > +igt@gem_concurrent_blit@1mib-full-cpu-render-gpu-read-after-write-forked > +igt@gem_concurrent_blit@1mib-full-cpu-render-gpu-read-after-write-interruptible > +igt@gem_concurrent_blit@1mib-full-cpu-render-intermix-bcs > +igt@gem_concurrent_blit@1mib-full-cpu-render-intermix-bcs-bomb > +igt@gem_concurrent_blit@1mib-full-cpu-render-intermix-bcs-child > +igt@gem_concurrent_blit@1mib-full-cpu-render-intermix-bcs-forked > +igt@gem_concurrent_blit@1mib-full-cpu-render-intermix-bcs-interruptible > +igt@gem_concurrent_blit@1mib-full-cpu-render-intermix-both > +igt@gem_concurrent_blit@1mib-full-cpu-render-intermix-both-bomb > +igt@gem_concurrent_blit@1mib-full-cpu-render-intermix-both-child > +igt@gem_concurrent_blit@1mib-full-cpu-render-intermix-both-forked > +igt@gem_concurrent_blit@1mib-full-cpu-render-intermix-both-interruptible > +igt@gem_concurrent_blit@1mib-full-cpu-render-intermix-rcs > +igt@gem_concurrent_blit@1mib-full-cpu-render-intermix-rcs-bomb > +igt@gem_concurrent_blit@1mib-full-cpu-render-intermix-rcs-child > +igt@gem_concurrent_blit@1mib-full-cpu-render-intermix-rcs-forked > +igt@gem_concurrent_blit@1mib-full-cpu-render-intermix-rcs-interruptible > +igt@gem_concurrent_blit@1mib-full-cpu-render-overwrite-source > +igt@gem_concurrent_blit@1mib-full-cpu-render-overwrite-source-bomb > +igt@gem_concurrent_blit@1mib-full-cpu-render-overwrite-source-child > +igt@gem_concurrent_blit@1mib-full-cpu-render-overwrite-source-forked > +igt@gem_concurrent_blit@1mib-full-cpu-render-overwrite-source-interruptible > +igt@gem_concurrent_blit@1mib-full-cpu-render-overwrite-source-one > +igt@gem_concurrent_blit@1mib-full-cpu-render-overwrite-source-one-bomb > +igt@gem_concurrent_blit@1mib-full-cpu-render-overwrite-source-one-child > +igt@gem_concurrent_blit@1mib-full-cpu-render-overwrite-source-one-forked > +igt@gem_concurrent_blit@1mib-full-cpu-render-overwrite-source-one-interruptible > +igt@gem_concurrent_blit@1mib-full-cpu-render-overwrite-source-read-bcs > +igt@gem_concurrent_blit@1mib-full-cpu-render-overwrite-source-read-bcs-bomb > +igt@gem_concurrent_blit@1mib-full-cpu-render-overwrite-source-read-bcs-child > +igt@gem_concurrent_blit@1mib-full-cpu-render-overwrite-source-read-bcs-forked > +igt@gem_concurrent_blit@1mib-full-cpu-render-overwrite-source-read-bcs-interruptible > +igt@gem_concurrent_blit@1mib-full-cpu-render-overwrite-source-read-rcs > +igt@gem_concurrent_blit@1mib-full-cpu-render-overwrite-source-read-rcs-bomb > +igt@gem_concurrent_blit@1mib-full-cpu-render-overwrite-source-read-rcs-child > +igt@gem_concurrent_blit@1mib-full-cpu-render-overwrite-source-read-rcs-forked > +igt@gem_concurrent_blit@1mib-full-cpu-render-overwrite-source-read-rcs-interruptible > +igt@gem_concurrent_blit@1mib-full-cpu-render-overwrite-source-rev > +igt@gem_concurrent_blit@1mib-full-cpu-render-overwrite-source-rev-bomb > +igt@gem_concurrent_blit@1mib-full-cpu-render-overwrite-source-rev-child > +igt@gem_concurrent_blit@1mib-full-cpu-render-overwrite-source-rev-forked > +igt@gem_concurrent_blit@1mib-full-cpu-render-overwrite-source-rev-interruptible > +igt@gem_concurrent_blit@1mib-full-cpu-render-read-read-bcs > +igt@gem_concurrent_blit@1mib-full-cpu-render-read-read-bcs-bomb > +igt@gem_concurrent_blit@1mib-full-cpu-render-read-read-bcs-child > +igt@gem_concurrent_blit@1mib-full-cpu-render-read-read-bcs-forked > +igt@gem_concurrent_blit@1mib-full-cpu-render-read-read-bcs-interruptible > +igt@gem_concurrent_blit@1mib-full-cpu-render-read-read-rcs > +igt@gem_concurrent_blit@1mib-full-cpu-render-read-read-rcs-bomb > +igt@gem_concurrent_blit@1mib-full-cpu-render-read-read-rcs-child > +igt@gem_concurrent_blit@1mib-full-cpu-render-read-read-rcs-forked > +igt@gem_concurrent_blit@1mib-full-cpu-render-read-read-rcs-interruptible > +igt@gem_concurrent_blit@1mib-full-cpu-render-sanitycheck0 > +igt@gem_concurrent_blit@1mib-full-cpu-render-sanitycheck0-bomb > +igt@gem_concurrent_blit@1mib-full-cpu-render-sanitycheck0-child > +igt@gem_concurrent_blit@1mib-full-cpu-render-sanitycheck0-forked > +igt@gem_concurrent_blit@1mib-full-cpu-render-sanitycheck0-interruptible > +igt@gem_concurrent_blit@1mib-full-cpu-render-sanitycheck1 > +igt@gem_concurrent_blit@1mib-full-cpu-render-sanitycheck1-bomb > +igt@gem_concurrent_blit@1mib-full-cpu-render-sanitycheck1-child > +igt@gem_concurrent_blit@1mib-full-cpu-render-sanitycheck1-forked > +igt@gem_concurrent_blit@1mib-full-cpu-render-sanitycheck1-interruptible > +igt@gem_concurrent_blit@1mib-full-cpu-render-sanitycheckn > +igt@gem_concurrent_blit@1mib-full-cpu-render-sanitycheckn-bomb > +igt@gem_concurrent_blit@1mib-full-cpu-render-sanitycheckn-child > +igt@gem_concurrent_blit@1mib-full-cpu-render-sanitycheckn-forked > +igt@gem_concurrent_blit@1mib-full-cpu-render-sanitycheckn-interruptible > +igt@gem_concurrent_blit@1mib-full-cpu-render-write-read-bcs > +igt@gem_concurrent_blit@1mib-full-cpu-render-write-read-bcs-bomb > +igt@gem_concurrent_blit@1mib-full-cpu-render-write-read-bcs-child > +igt@gem_concurrent_blit@1mib-full-cpu-render-write-read-bcs-forked > +igt@gem_concurrent_blit@1mib-full-cpu-render-write-read-bcs-interruptible > +igt@gem_concurrent_blit@1mib-full-cpu-render-write-read-rcs > +igt@gem_concurrent_blit@1mib-full-cpu-render-write-read-rcs-bomb > +igt@gem_concurrent_blit@1mib-full-cpu-render-write-read-rcs-child > +igt@gem_concurrent_blit@1mib-full-cpu-render-write-read-rcs-forked > +igt@gem_concurrent_blit@1mib-full-cpu-render-write-read-rcs-interruptible > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-early-read > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-early-read-bomb > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-early-read-child > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-early-read-forked > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-early-read-interruptible > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-gpu-read-after-write > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-gpu-read-after-write-bomb > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-gpu-read-after-write-child > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-gpu-read-after-write-forked > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-gpu-read-after-write-interruptible > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-intermix-bcs > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-intermix-bcs-bomb > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-intermix-bcs-child > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-intermix-bcs-forked > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-intermix-bcs-interruptible > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-intermix-both > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-intermix-both-bomb > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-intermix-both-child > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-intermix-both-forked > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-intermix-both-interruptible > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-intermix-rcs > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-intermix-rcs-bomb > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-intermix-rcs-child > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-intermix-rcs-forked > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-intermix-rcs-interruptible > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-overwrite-source > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-overwrite-source-bomb > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-overwrite-source-child > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-overwrite-source-forked > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-overwrite-source-interruptible > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-overwrite-source-one > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-overwrite-source-one-bomb > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-overwrite-source-one-child > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-overwrite-source-one-forked > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-overwrite-source-one-interruptible > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-overwrite-source-read-bcs > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-overwrite-source-read-bcs-bomb > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-overwrite-source-read-bcs-child > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-overwrite-source-read-bcs-forked > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-overwrite-source-read-bcs-interruptible > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-overwrite-source-read-rcs > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-overwrite-source-read-rcs-bomb > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-overwrite-source-read-rcs-child > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-overwrite-source-read-rcs-forked > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-overwrite-source-read-rcs-interruptible > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-overwrite-source-rev > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-overwrite-source-rev-bomb > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-overwrite-source-rev-child > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-overwrite-source-rev-forked > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-overwrite-source-rev-interruptible > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-read-read-bcs > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-read-read-bcs-bomb > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-read-read-bcs-child > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-read-read-bcs-forked > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-read-read-bcs-interruptible > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-read-read-rcs > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-read-read-rcs-bomb > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-read-read-rcs-child > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-read-read-rcs-forked > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-read-read-rcs-interruptible > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-sanitycheck0 > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-sanitycheck0-bomb > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-sanitycheck0-child > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-sanitycheck0-forked > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-sanitycheck0-interruptible > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-sanitycheck1 > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-sanitycheck1-bomb > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-sanitycheck1-child > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-sanitycheck1-forked > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-sanitycheck1-interruptible > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-sanitycheckn > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-sanitycheckn-bomb > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-sanitycheckn-child > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-sanitycheckn-forked > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-sanitycheckn-interruptible > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-write-read-bcs > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-write-read-bcs-bomb > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-write-read-bcs-child > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-write-read-bcs-forked > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-write-read-bcs-interruptible > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-write-read-rcs > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-write-read-rcs-bomb > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-write-read-rcs-child > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-write-read-rcs-forked > +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-write-read-rcs-interruptible > +igt@gem_concurrent_blit@1mib-full-dmabuf-render-early-read > +igt@gem_concurrent_blit@1mib-full-dmabuf-render-early-read-bomb > +igt@gem_concurrent_blit@1mib-full-dmabuf-render-early-read-child > +igt@gem_concurrent_blit@1mib-full-dmabuf-render-early-read-forked > +igt@gem_concurrent_blit@1mib-full-dmabuf-render-early-read-interruptible > +igt@gem_concurrent_blit@1mib-full-dmabuf-render-gpu-read-after-write > +igt@gem_concurrent_blit@1mib-full-dmabuf-render-gpu-read-after-write-bomb > +igt@gem_concurrent_blit@1mib-full-dmabuf-render-gpu-read-after-write-child > +igt@gem_concurrent_blit@1mib-full-dmabuf-render-gpu-read-after-write-forked > +igt@gem_concurrent_blit@1mib-full-dmabuf-render-gpu-read-after-write-interruptible > +igt@gem_concurrent_blit@1mib-full-dmabuf-render-intermix-bcs > +igt@gem_concurrent_blit@1mib-full-dmabuf-render-intermix-bcs-bomb > +igt@gem_concurrent_blit@1mib-full-dmabuf-render-intermix-bcs-child > +igt@gem_concurrent_blit@1mib-full-dmabuf-render-intermix-bcs-forked > +igt@gem_concurrent_blit@1mib-full-dmabuf-render-intermix-bcs-interruptible > +igt@gem_concurrent_blit@1mib-full-dmabuf-render-intermix-both > +igt@gem_concurrent_blit@1mib-full-dmabuf-render-intermix-both-bomb > +igt@gem_concurrent_blit@1mib-full-dmabuf-render-intermix-both-child > +igt@gem_concurrent_blit@1mib-full-dmabuf-render-intermix-both-forked > +igt@gem_concurrent_blit@1mib-full-dmabuf-render-intermix-both-interruptible > +igt@gem_concurrent_blit@1mib-full-dmabuf-render-intermix-rcs > +igt@gem_concurrent_blit@1mib-full-dmabuf-render-intermix-rcs-bomb > +igt@gem_concurrent_blit@1mib-full-dmabuf-render-intermix-rcs-child > +igt@gem_concurrent_blit@1mib-full-dmabuf-render-intermix-rcs-forked > +igt@gem_concurrent_blit@1mib-full-dmabuf-render-intermix-rcs-interruptible > +igt@gem_concurrent_blit@1mib-full-dmabuf-render-overwrite-source > +igt@gem_concurrent_blit@1mib-full-dmabuf-render-overwrite-source-bomb > +igt@gem_concurrent_blit@1mib-full-dmabuf-render-overwrite-source-child > +igt@gem_concurrent_blit@1mib-full-dmabuf-render-overwrite-source-forked > +igt@gem_concurrent_blit@1mib-full-dmabuf-render-overwrite-source-interruptible > +igt@gem_concurrent_blit@1mib-full-dmabuf-render-overwrite-source-one > +igt@gem_concurrent_blit@1mib-full-dmabuf-render-overwrite-source-one-bomb > +igt@gem_concurrent_blit@1mib-full-dmabuf-render-overwrite-source-one-child > +igt@gem_concurrent_blit@1mib-full-dmabuf-render-overwrite-source-one-for And couple of thousands lines just like that. This should make the difference more apparent: +igt@gem_concurrent_blit@1mib-full-dmabuf-blt-sanitycheckn-child -igt@gem_concurrent_blit@1MiB-full-dmabuf-blt-sanitycheckn-child Because piglit handles everything with .to_lowercase(). It's fine from the Jenkins POV, as post-merge this will become the new reference testlist, and the following pre-merge patches will use the new format as well. Acked-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com> Now we just have to contain the noise caused by case sensitivity within the cibuglog. > == Logs == > > For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_438/ > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
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
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 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@intel.com> Cc: Tomi Sarvela <tomi.p.sarvela@intel.com> Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com> --- 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(-)