Merge pull request #20134 from owncloud/pass-with-skipping

Make Travis CI pass when DAV was not touched

2 files changed, 18 insertions, 17 deletions

diff --git a/tests/travis/changed_app.sh b/tests/travis/changed_app.sh
new file mode 100755
index 00000000000..a4be0476573
--- /dev/null
+++ b/tests/travis/changed_app.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+#
+# ownCloud
+#
+# @author Joas Schilling
+# @author Thomas Müller
+# @copyright 2015 Thomas Müller thomas.mueller@tmit.eu
+#
+
+APP=$1
+
+FOUND=$(git diff ${TRAVIS_COMMIT_RANGE} | grep -- "^+++ b/apps/$APP/")
+
+if [ "x$FOUND" != 'x' ]; then
+	echo "1"
+else
+	echo "0"
+fi
diff --git a/tests/travis/test_for_app.sh b/tests/travis/test_for_app.sh
deleted file mode 100755
index a97c66dba83..00000000000
--- a/tests/travis/test_for_app.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-#
-# ownCloud
-#
-# @author Thomas Müller
-# @copyright 2015 Thomas Müller thomas.mueller@tmit.eu
-#
-
-set -e
-APP=$1
-
-if git diff ${TRAVIS_COMMIT_RANGE} | grep -- "^+++ b/apps/$APP/"; then
-	echo "Executing this test config ...."
-else
-	echo "Test config is not relevant for this change. terminating"
-	exit 1
-fi