scripts/run_tests.sh: Fix breakage after piglit updates.

PATCH In review Maarten Lankhorst 5 participants 7 messages Apr 19, 2016

lore

Share & tools

lore

Maarten Lankhorst

author

2016-04-19 13:31 UTC #0 lore raw

PATCH 1/1 scripts/run_tests.sh: Fix breakage after piglit updates.

Right now scripts/run-tests.sh fails with the following error message:

Fatal Error: Cannot overwrite existing folder without the -o/--overwrite option being set.

Fix this by adding -o as required.

Signed-off-by Maarten Lankhorst <[email protected]>

---

scripts/run-tests.sh +1 -1

index 99e6124f5279..f33b0ffd342a 100755
@@ -125,7 +125,7 @@ if [ "x$RESUME" != "x" ]; then
 	sudo IGT_TEST_ROOT="$IGT_TEST_ROOT" "$PIGLIT" resume "$RESULTS" $NORETRY
 else
 	mkdir -p "$RESULTS"
-	sudo IGT_TEST_ROOT="$IGT_TEST_ROOT" "$PIGLIT" run igt "$RESULTS" -s $VERBOSE $EXCLUDE $FILTER
+	sudo IGT_TEST_ROOT="$IGT_TEST_ROOT" "$PIGLIT" run igt "$RESULTS" -o -s $VERBOSE $EXCLUDE $FILTER
 fi
 
 if [ "$SUMMARY" == "html" ]; then

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

Ville Syrjälä

2016-04-19 13:38 UTC #1 lore raw

Quoted 13 lines · Maarten Lankhorst

Right now scripts/run-tests.sh fails with the following error message:
Fatal Error: Cannot overwrite existing folder without the -o/--overwrite option being set.
Fix this by adding -o as required.
Signed-off-by Maarten Lankhorst <[email protected]>
---
scripts/run-tests.sh +0 -0
index 99e6124f5279..f33b0ffd342a 100755

scripts/run-tests.sh if [ "x$RESUME" != "x" ]; then · line 127

Quoted 3 lines

scripts/run-tests.sh +0 -0

@@ -125,7 +125,7 @@ if [ "x$RESUME" != "x" ]; then
 	sudo IGT_TEST_ROOT="$IGT_TEST_ROOT" "$PIGLIT" resume "$RESULTS" $NORETRY
 else
 	mkdir -p "$RESULTS"

Just drop the mkdir instead?

Quoted 11 lines

scripts/run-tests.sh +1 -1
-	sudo IGT_TEST_ROOT="$IGT_TEST_ROOT" "$PIGLIT" run igt "$RESULTS" -s $VERBOSE $EXCLUDE $FILTER
+	sudo IGT_TEST_ROOT="$IGT_TEST_ROOT" "$PIGLIT" run igt "$RESULTS" -o -s $VERBOSE $EXCLUDE $FILTER
 fi
 
 if [ "$SUMMARY" == "html" ]; then
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Signature · 6 lines

Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Maarten Lankhorst

author

2016-04-19 13:40 UTC #2 lore raw

Op 19-04-16 om 15:38 schreef Ville Syrjälä:

Quoted 7 lines · Maarten Lankhorst

Quoted 6 lines
Right now scripts/run-tests.sh fails with the following error message:
Fatal Error: Cannot overwrite existing folder without the -o/--overwrite option being set.
Fix this by adding -o as required.

Quoted 12 lines

scripts/run-tests.sh if [ "x$RESUME" != "x" ]; then · line 127
Quoted 10 lines
Signed-off-by Maarten Lankhorst <[email protected]>
---
scripts/run-tests.sh +0 -0
index 99e6124f5279..f33b0ffd342a 100755
@@ -125,7 +125,7 @@ if [ "x$RESUME" != "x" ]; then
 	sudo IGT_TEST_ROOT="$IGT_TEST_ROOT" "$PIGLIT" resume "$RESULTS" $NORETRY
 else
 	mkdir -p "$RESULTS"
Just drop the mkdir instead?

In that case I wouldn't be able to retry in an existing directory.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Ville Syrjälä

2016-04-19 13:50 UTC #3 lore raw

Quoted 20 lines · Maarten Lankhorst

Op 19-04-16 om 15:38 schreef Ville Syrjälä:
Quoted 7 lines · Maarten Lankhorst
Quoted 6 lines
Right now scripts/run-tests.sh fails with the following error message:
Fatal Error: Cannot overwrite existing folder without the -o/--overwrite option being set.
Fix this by adding -o as required.
Quoted 12 lines
scripts/run-tests.sh if [ "x$RESUME" != "x" ]; then · line 127
Quoted 10 lines
Signed-off-by Maarten Lankhorst <[email protected]>
---
scripts/run-tests.sh +0 -0
index 99e6124f5279..f33b0ffd342a 100755
@@ -125,7 +125,7 @@ if [ "x$RESUME" != "x" ]; then
 	sudo IGT_TEST_ROOT="$IGT_TEST_ROOT" "$PIGLIT" resume "$RESULTS" $NORETRY
 else
 	mkdir -p "$RESULTS"
Just drop the mkdir instead?

Quoted 1 line

In that case I wouldn't be able to retry in an existing directory.

Which some people may consider a good thing.

Signature · 6 lines

Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Marius Vlad

2016-04-19 14:12 UTC #4 lore raw

In reply to Maarten Lankhorst

There was some discussions about this before:

https://lists.freedesktop.org/archives/intel-gfx/2016-March/089128.html
and
https://lists.freedesktop.org/archives/intel-gfx/2016-March/090302.html

There's some concern that his approach might brake with older versions of piglit. Is this still the case, or we can push this?

Quoted 23 lines · Maarten Lankhorst

Right now scripts/run-tests.sh fails with the following error message:
Fatal Error: Cannot overwrite existing folder without the -o/--overwrite option being set.
Fix this by adding -o as required.
Signed-off-by Maarten Lankhorst <[email protected]>
---
scripts/run-tests.sh +1 -1
index 99e6124f5279..f33b0ffd342a 100755
@@ -125,7 +125,7 @@ if [ "x$RESUME" != "x" ]; then
 	sudo IGT_TEST_ROOT="$IGT_TEST_ROOT" "$PIGLIT" resume "$RESULTS" $NORETRY
 else
 	mkdir -p "$RESULTS"
-	sudo IGT_TEST_ROOT="$IGT_TEST_ROOT" "$PIGLIT" run igt "$RESULTS" -s $VERBOSE $EXCLUDE $FILTER
+	sudo IGT_TEST_ROOT="$IGT_TEST_ROOT" "$PIGLIT" run igt "$RESULTS" -o -s $VERBOSE $EXCLUDE $FILTER
 fi
 
 if [ "$SUMMARY" == "html" ]; then

Quoted 4 lines

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

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

Vivi, Rodrigo

Acked-by

2016-04-19 14:30 UTC #5 lore raw

Well, I don't see how to do it in a good and safe way for the old versions that didn't have the version check, so or we do an ugly version of it or we just ask people to upgrade the piglit when they start to report this commit is breaking stuff.

Really up to you. But I believe we need on solution or another so if you decide to go with this patch feel free to use:

Acked-by Rodrigo Vivi <[email protected]>

Quoted 39 lines · Marius Vlad

There was some discussions about this before:
https://lists.freedesktop.org/archives/intel-gfx/2016-March/089128.ht
ml
and
https://lists.freedesktop.org/archives/intel-gfx/2016-March/090302.ht
ml
There's some concern that his approach might brake with older versions
of piglit. Is this still the case, or we can push this?
Quoted 26 lines · Maarten Lankhorst
Right now scripts/run-tests.sh fails with the following error message:
Fatal Error: Cannot overwrite existing folder without the -o/- -overwrite option being set.
Fix this by adding -o as required.
Signed-off-by Maarten Lankhorst <[email protected]
Quoted 1 line
---
scripts/run-tests.sh +0 -0
index 99e6124f5279..f33b0ffd342a 100755
@@ -125,7 +125,7 @@ if [ "x$RESUME" != "x" ]; then
 	sudo IGT_TEST_ROOT="$IGT_TEST_ROOT" "$PIGLIT" resume
"$RESULTS" $NORETRY
else
scripts/run-tests.sh +0 -1
 	mkdir -p "$RESULTS"
-	sudo IGT_TEST_ROOT="$IGT_TEST_ROOT" "$PIGLIT" run igt
"$RESULTS" -s $VERBOSE $EXCLUDE $FILTER
scripts/run-tests.sh +1 -0
+	sudo IGT_TEST_ROOT="$IGT_TEST_ROOT" "$PIGLIT" run igt
"$RESULTS" -o -s $VERBOSE $EXCLUDE $FILTER
fi

Quoted 7 lines

Quoted 7 lines
if [ "$SUMMARY" == "html" ]; then
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

Dylan Baker

Acked-by

2016-04-19 18:14 UTC #6 lore raw

Quoting Vivi, Rodrigo (2016-04-19 07:23:02)

Quoted 50 lines

Well, I don't see how to do it in a good and safe way for the old versions that didn't have the version check, so or we do an ugly version of it or we just ask people to upgrade the piglit when they start to report this commit is breaking stuff.
Really up to you. But I believe we need on solution or another so if you decide to go with this patch feel free to use:
Acked-by Rodrigo Vivi <[email protected]>
Quoted 39 lines · Marius Vlad
There was some discussions about this before:
https://lists.freedesktop.org/archives/intel-gfx/2016-March/089128.ht
ml
and
https://lists.freedesktop.org/archives/intel-gfx/2016-March/090302.ht
ml
There's some concern that his approach might brake with older versions
of piglit. Is this still the case, or we can push this?
Quoted 26 lines · Maarten Lankhorst
Right now scripts/run-tests.sh fails with the following error message:
Fatal Error: Cannot overwrite existing folder without the -o/- -overwrite option being set.
Fix this by adding -o as required.
Signed-off-by Maarten Lankhorst <[email protected]
Quoted 1 line
---
scripts/run-tests.sh +0 -0
index 99e6124f5279..f33b0ffd342a 100755
@@ -125,7 +125,7 @@ if [ "x$RESUME" != "x" ]; then
    sudo IGT_TEST_ROOT="$IGT_TEST_ROOT" "$PIGLIT" resume
"$RESULTS" $NORETRY
else
mkdir -p "$RESULTS"
- sudo IGT_TEST_ROOT="$IGT_TEST_ROOT" "$PIGLIT" run igt
"$RESULTS" -s $VERBOSE $EXCLUDE $FILTER
+ sudo IGT_TEST_ROOT="$IGT_TEST_ROOT" "$PIGLIT" run igt
"$RESULTS" -o -s $VERBOSE $EXCLUDE $FILTER
fi

Quoted 7 lines

Quoted 7 lines
Quoted 7 lines
if [ "$SUMMARY" == "html" ]; then
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

I think removing the mkdir call will fix piglit before the -o and after the -o switch. But if you're willing to ask people to upgrade piglit using the -o will be more robust.

Acked-by Dylan Baker <[email protected]>

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