Unify shell options

diff --git a/zypp-plugin/testsuite/.gitignore b/zypp-plugin/testsuite/.gitignore
index 42f171012843d82705abd7f15be505ce56c11c6e..06b59ae15e9fcaa6273079221986c181f621b590 100644 (file)
--- a/zypp-plugin/testsuite/.gitignore
+++ b/zypp-plugin/testsuite/.gitignore
@@ -1,3 +1,6 @@
 *.log
 *.trs
 test-suite.log
+# in the parent dir, *.test is a compilation result
+# but here it is our script so unignore it
+!*.test

diff --git a/zypp-plugin/testsuite/1-happy.test b/zypp-plugin/testsuite/1-happy.test
index 0059caea78ea68057cb07afa19f48434fe354df5..c4622c2e185cbf78d74acded6d35c98412e3f5be 100755 (executable)
--- a/zypp-plugin/testsuite/1-happy.test
+++ b/zypp-plugin/testsuite/1-happy.test
@@ -1,7 +1,6 @@
 #!/bin/bash
 set -e
 set -u
-#set -x
 
 . test-helper.sh
 

diff --git a/zypp-plugin/testsuite/2-malformed-xml.test b/zypp-plugin/testsuite/2-malformed-xml.test
index e09f8557c74e772d5b390e76f92c6cc0d335a378..bbe03f2e07fea5c6f10bd424d6ea06c2833050d5 100755 (executable)
--- a/zypp-plugin/testsuite/2-malformed-xml.test
+++ b/zypp-plugin/testsuite/2-malformed-xml.test
@@ -1,7 +1,6 @@
 #!/bin/bash
 set -e
 set -u
-#set -x
 
 # http://testanything.org/
 echo 1..1

diff --git a/zypp-plugin/testsuite/3-invalid-xml.test b/zypp-plugin/testsuite/3-invalid-xml.test
index 2fb6a2cc0d1c5b7190fb1b6f3e6f4ce99b25c134..8e18a17ec75caaa6a2aab926880794f80b02cfdd 100755 (executable)
--- a/zypp-plugin/testsuite/3-invalid-xml.test
+++ b/zypp-plugin/testsuite/3-invalid-xml.test
@@ -1,7 +1,6 @@
 #!/bin/bash
 set -e
 set -u
-#set -x
 
 # http://testanything.org/
 echo 1..1

diff --git a/zypp-plugin/testsuite/4-badjson.test b/zypp-plugin/testsuite/4-badjson.test
index 78744e90a3873fb1dca50e6904559f5911bb36c8..317240546eec993af76003acd301ae282c59a644 100755 (executable)
--- a/zypp-plugin/testsuite/4-badjson.test
+++ b/zypp-plugin/testsuite/4-badjson.test
@@ -1,7 +1,6 @@
 #!/bin/bash
 set -e
 set -u
-#set -x
 
 . test-helper.sh
 

diff --git a/zypp-plugin/testsuite/99-shell.test b/zypp-plugin/testsuite/99-shell.test
index 8c2eba64853e96ce22966c23d3c36e3218a937d5..a74f6737d58d2f4c9a37bba556304ccd43e30ec7 100755 (executable)
--- a/zypp-plugin/testsuite/99-shell.test
+++ b/zypp-plugin/testsuite/99-shell.test
@@ -1,6 +1,9 @@
 #!/bin/bash
+set -e
+set -u
+
 if ! type -P shellcheck >/dev/null; then
-   echo "1..0 # SKIP No shellcheck"
+   echo "1..0 # SKIP https://www.shellcheck.net/ is not installed"
    exit
 fi
 echo "1..1"