From 1c39d26973b4bb472206e5941079cc94d2d504b7 Mon Sep 17 00:00:00 2001
From: Martin Vidner <mvidner@suse.cz>
Date: Tue, 17 Dec 2019 11:20:29 +0100
Subject: [PATCH] Unify shell options

---
 zypp-plugin/testsuite/.gitignore           | 3 +++
 zypp-plugin/testsuite/1-happy.test         | 1 -
 zypp-plugin/testsuite/2-malformed-xml.test | 1 -
 zypp-plugin/testsuite/3-invalid-xml.test   | 1 -
 zypp-plugin/testsuite/4-badjson.test       | 1 -
 zypp-plugin/testsuite/99-shell.test        | 5 ++++-
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/zypp-plugin/testsuite/.gitignore b/zypp-plugin/testsuite/.gitignore
index 42f17101..06b59ae1 100644
--- 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 0059caea..c4622c2e 100755
--- 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 e09f8557..bbe03f2e 100755
--- 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 2fb6a2cc..8e18a17e 100755
--- 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 78744e90..31724054 100755
--- 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 8c2eba64..a74f6737 100755
--- 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"
-- 
2.47.3