Skip to contentSkip to conversation

assembler: Fix bashism in run-test.sh

i-g-t In review Rhys Kidd 4 participants 6 messages Oct 29, 2017 – Oct 30, 2017

lore
Share & tools
lore

Rhys Kidd

author
#0 lore raw

[[ a != b ]] is a bashism. As it's just comparing $1 to an empty string, use -n with a normal [ ].

Noticed whilst testing meson builds. /bin/sh is apparently dash in Intel's CI.

Also change the script to #!/bin/bash to avoid having to babysit bashism later.

Fixes c3863e19 ("assembler/test: Prep work for meson")
CC Daniel Vetter <[email protected]>
CC Petri Latvala <[email protected]>
---
 assembler/test/run-test.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
assembler/test/run-test.sh +2 -2
index 0a5252a8..b5e245bc 100644
@@ -1,11 +1,11 @@
-#!/bin/sh
+#!/bin/bash
 
 SRCDIR=${srcdir-`pwd`}
 BUILDDIR=${top_builddir-`pwd`}
 
 test="TEST"
 
-if [[ "$1" != "" ]] ; then
+if [ -n "$1" ] ; then
 	test="$1"
 fi
 
Signature · 6 lines
2.14.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

✗ Fi.CI.BAT: failure for assembler: Fix bashism in run-test.sh

== Series Details ==

== Series Details ==

Series: assembler: Fix bashism in run-test.sh
URL : https://patchwork.freedesktop.org/series/32810/
State : failure

== 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

No testlist changes.

Test gem_exec_fence:

        Subgroup await-hang-default:
                pass       -> INCOMPLETE (fi-glk-dsi)
fi-bdw-5557u     total:289  pass:268  dwarn:0   dfail:0   fail:0   skip:21  time:451s
fi-bdw-gvtdvm    total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:457s
fi-blb-e6850     total:289  pass:223  dwarn:1   dfail:0   fail:0   skip:65  time:376s
fi-bsw-n3050     total:289  pass:243  dwarn:0   dfail:0   fail:0   skip:46  time:542s
fi-bwr-2160      total:289  pass:183  dwarn:0   dfail:0   fail:0   skip:106 time:269s
fi-bxt-dsi       total:289  pass:259  dwarn:0   dfail:0   fail:0   skip:30  time:501s
fi-bxt-j4205     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:496s
fi-byt-j1900     total:289  pass:253  dwarn:1   dfail:0   fail:0   skip:35  time:494s
fi-byt-n2820     total:289  pass:249  dwarn:1   dfail:0   fail:0   skip:39  time:481s
fi-cnl-y         total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:610s
fi-elk-e7500     total:289  pass:229  dwarn:0   dfail:0   fail:0   skip:60  time:418s
fi-gdg-551       total:289  pass:178  dwarn:1   dfail:0   fail:1   skip:109 time:263s
fi-glk-1         total:289  pass:261  dwarn:0   dfail:0   fail:0   skip:28  time:583s
fi-glk-dsi       total:58   pass:42   dwarn:0   dfail:0   fail:0   skip:15 
fi-hsw-4770      total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:431s
fi-hsw-4770r     total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:429s
fi-ilk-650       total:289  pass:228  dwarn:0   dfail:0   fail:0   skip:61  time:428s
fi-ivb-3520m     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:494s
fi-ivb-3770      total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:464s
fi-kbl-7500u     total:289  pass:264  dwarn:1   dfail:0   fail:0   skip:24  time:489s
fi-kbl-7560u     total:289  pass:270  dwarn:0   dfail:0   fail:0   skip:19  time:576s
fi-kbl-7567u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:480s
fi-kbl-r         total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:585s
fi-pnv-d510      total:289  pass:222  dwarn:1   dfail:0   fail:0   skip:66  time:558s
fi-skl-6260u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:453s
fi-skl-6600u     total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:592s
fi-skl-6700hq    total:289  pass:263  dwarn:0   dfail:0   fail:0   skip:26  time:648s
fi-skl-6700k     total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:524s
fi-skl-6770hq    total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:502s
fi-skl-gvtdvm    total:289  pass:266  dwarn:0   dfail:0   fail:0   skip:23  time:452s
fi-snb-2520m     total:289  pass:250  dwarn:0   dfail:0   fail:0   skip:39  time:574s
fi-snb-2600      total:289  pass:249  dwarn:0   dfail:0   fail:0   skip:40  time:430s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_434/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by
#2 lore raw
In reply to Rhys Kidd
Quoted 6 lines · Rhys Kidd

[[ a != b ]] is a bashism. As it's just comparing $1 to an empty string, use -n with a normal [ ].

Noticed whilst testing meson builds. /bin/sh is apparently dash in Intel's CI.

Also change the script to #!/bin/bash to avoid having to babysit bashism later.

Just leave the shebang as it is, then this is;

Regards, Joonas

Signature · 7 lines
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
author
#3 lore raw

PATCH v2 1/1 assembler: Fix bashism in run-test.sh

[[ a != b ]] is a bashism. As it's just comparing $1 to an empty string, use -n with a normal [ ].

Noticed whilst testing meson builds. /bin/sh is apparently dash in Intel's CI.

v2:
- keep this as a /bin/sh script (Joonas Lahtinen)

Fixes c3863e19 ("assembler/test: Prep work for meson")
CC Daniel Vetter <[email protected]>
CC Petri Latvala <[email protected]>
---
 assembler/test/run-test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
assembler/test/run-test.sh +1 -1
index 0a5252a8..b06e1044 100644
@@ -5,7 +5,7 @@ BUILDDIR=${top_builddir-`pwd`}
 
 test="TEST"
 
-if [[ "$1" != "" ]] ; then
+if [ -n "$1" ] ; then
 	test="$1"
 fi
 
Signature · 6 lines
2.14.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#5 lore raw

✗ Fi.CI.BAT: failure for assembler: Fix bashism in run-test.sh (rev2)

In reply to Rhys Kidd
== Series Details ==

== Series Details ==

Series: assembler: Fix bashism in run-test.sh (rev2)
URL : https://patchwork.freedesktop.org/series/32810/
State : failure

== 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_3293
13309d478b5f drm-tip: 2017y-10m-30d-10h-04m-34s UTC integration manifest

No testlist changes.

Test gem_exec_nop:

        Subgroup basic-parallel:
                dmesg-fail -> PASS       (fi-glk-dsi) fdo#103514 +4
        Subgroup basic-series:
                skip       -> PASS       (fi-glk-dsi)
Test gem_exec_parallel:
        Subgroup basic:
                skip       -> PASS       (fi-glk-dsi)
Test gem_exec_reloc:
        Subgroup basic-cpu:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-gtt:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-cpu-gtt:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-gtt-cpu:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-cpu-read:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-gtt-read:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-write-cpu:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-write-gtt:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-write-read:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-cpu-noreloc:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-gtt-noreloc:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-cpu-gtt-noreloc:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-gtt-cpu-noreloc:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-cpu-read-noreloc:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-gtt-read-noreloc:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-write-cpu-noreloc:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-write-gtt-noreloc:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-write-read-noreloc:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-cpu-active:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-gtt-active:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-cpu-gtt-active:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-gtt-cpu-active:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-cpu-read-active:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-gtt-read-active:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-write-cpu-active:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-write-gtt-active:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-write-read-active:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-softpin:
                skip       -> PASS       (fi-glk-dsi)
Test gem_exec_store:
        Subgroup basic-all:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-blt:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-bsd:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-default:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-render:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-vebox:
                skip       -> PASS       (fi-glk-dsi)
Test gem_exec_suspend:
        Subgroup basic:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-s3:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-s4-devices:
                skip       -> PASS       (fi-glk-dsi)
Test gem_linear_blits:
        Subgroup basic:
                skip       -> PASS       (fi-glk-dsi)
Test gem_render_linear_blits:
        Subgroup basic:
                skip       -> PASS       (fi-glk-dsi)
Test gem_render_tiled_blits:
        Subgroup basic:
                skip       -> PASS       (fi-glk-dsi)
Test gem_ringfill:
        Subgroup basic-default:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-default-interruptible:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-default-forked:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-default-fd:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-default-hang:
                skip       -> PASS       (fi-glk-dsi)
Test gem_sync:
        Subgroup basic-all:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-each:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-many-each:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-store-all:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-store-each:
                skip       -> PASS       (fi-glk-dsi)
Test gem_tiled_blits:
        Subgroup basic:
                skip       -> PASS       (fi-glk-dsi)
Test gem_tiled_fence_blits:
        Subgroup basic:
                skip       -> PASS       (fi-glk-dsi)
Test gem_wait:
        Subgroup basic-busy-all:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-wait-all:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-await-all:
                skip       -> PASS       (fi-glk-dsi)
Test gem_workarounds:
        Subgroup basic-read:
                skip       -> PASS       (fi-glk-dsi)
Test kms_busy:
        Subgroup basic-flip-a:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-flip-b:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-flip-c:
                skip       -> PASS       (fi-glk-dsi)
Test kms_cursor_legacy:
        Subgroup basic-busy-flip-before-cursor-atomic:
                skip       -> PASS       (fi-glk-dsi)
        Subgroup basic-busy-flip-before-cursor-legacy:
                fail       -> PASS       (fi-gdg-551) fdo#102618
                skip       -> PASS       (fi-glk-dsi)
Test kms_frontbuffer_tracking:
        Subgroup basic:
                skip       -> FAIL       (fi-glk-dsi) fdo#103167
Test kms_setmode:
        Subgroup basic-clone-single-crtc:
                pass       -> DMESG-WARN (fi-skl-6700k)
Test kms_sink_crc_basic:
                skip       -> INCOMPLETE (fi-skl-6700k)

fdo#103514 https://bugs.freedesktop.org/show_bug.cgi?id=103514
fdo#102618 https://bugs.freedesktop.org/show_bug.cgi?id=102618
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167

fi-bdw-5557u     total:289  pass:268  dwarn:0   dfail:0   fail:0   skip:21  time:444s
fi-bdw-gvtdvm    total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:458s
fi-blb-e6850     total:289  pass:223  dwarn:1   dfail:0   fail:0   skip:65  time:429s
fi-bsw-n3050     total:289  pass:243  dwarn:0   dfail:0   fail:0   skip:46  time:530s
fi-bwr-2160      total:289  pass:183  dwarn:0   dfail:0   fail:0   skip:106 time:271s
fi-bxt-dsi       total:289  pass:259  dwarn:0   dfail:0   fail:0   skip:30  time:498s
fi-bxt-j4205     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:498s
fi-byt-j1900     total:289  pass:253  dwarn:1   dfail:0   fail:0   skip:35  time:498s
fi-byt-n2820     total:289  pass:249  dwarn:1   dfail:0   fail:0   skip:39  time:485s
fi-cfl-s         total:289  pass:253  dwarn:4   dfail:0   fail:0   skip:32  time:560s
fi-cnl-y         total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:602s
fi-elk-e7500     total:289  pass:229  dwarn:0   dfail:0   fail:0   skip:60  time:425s
fi-gdg-551       total:289  pass:178  dwarn:1   dfail:0   fail:1   skip:109 time:251s
fi-glk-1         total:289  pass:261  dwarn:0   dfail:0   fail:0   skip:28  time:585s
fi-glk-dsi       total:289  pass:258  dwarn:0   dfail:0   fail:1   skip:30  time:490s
fi-hsw-4770      total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:430s
fi-hsw-4770r     total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:426s
fi-ilk-650       total:289  pass:228  dwarn:0   dfail:0   fail:0   skip:61  time:427s
fi-ivb-3520m     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:491s
fi-ivb-3770      total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:460s
fi-kbl-7500u     total:289  pass:264  dwarn:1   dfail:0   fail:0   skip:24  time:493s
fi-kbl-7560u     total:289  pass:270  dwarn:0   dfail:0   fail:0   skip:19  time:569s
fi-kbl-7567u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:480s
fi-kbl-r         total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:589s
fi-pnv-d510      total:289  pass:222  dwarn:1   dfail:0   fail:0   skip:66  time:540s
fi-skl-6260u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:452s
fi-skl-6600u     total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:594s
fi-skl-6700hq    total:289  pass:263  dwarn:0   dfail:0   fail:0   skip:26  time:652s
fi-skl-6700k     total:250  pass:227  dwarn:1   dfail:0   fail:0   skip:21 
fi-skl-6770hq    total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:497s
fi-skl-gvtdvm    total:289  pass:266  dwarn:0   dfail:0   fail:0   skip:23  time:462s
fi-snb-2520m     total:289  pass:250  dwarn:0   dfail:0   fail:0   skip:39  time:565s
fi-snb-2600      total:289  pass:249  dwarn:0   dfail:0   fail:0   skip:40  time:419s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_443/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw
In reply to Rhys Kidd
Quoted 5 lines · Rhys Kidd

[[ a != b ]] is a bashism. As it's just comparing $1 to an empty string, use -n with a normal [ ].

Noticed whilst testing meson builds. /bin/sh is apparently dash in Intel's CI.

Quoted 8 lines

v2:
- keep this as a /bin/sh script (Joonas Lahtinen)

Fixes c3863e19 ("assembler/test: Prep work for meson")
CC Daniel Vetter <[email protected]>
CC Petri Latvala <[email protected]>

Thanks for patch and the review!
Pushed.

Signature · 6 lines
Cheers,
Arek
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx