From: Joe Orton <jorton@apache.org>
Date: Fri, 3 Sep 2021 08:33:22 +0000 (+0000)
Subject: Merge r1892841, r1892845 from trunk:
X-Git-Tag: candidate-2.4.49~1^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f128f4becddaba748914ccd83da28745df20c82;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1892841, r1892845 from trunk:

Adjust Travis conditions for candidate-2.4.x tags.

Second attempt at updating the Travis conditions to work properly
for candidate-2.4.x branches, and add a mini test script for the
conditions.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1892846 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/.travis.yml b/.travis.yml
index fac863ef509..96fefc645c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,8 +37,8 @@ env:
 # definitions to either:
 #  condition_24x_only => run the job only for 2.4.x
 #  condition_not_24x  => run the job everywhere EXCEPT 2.4.x
-_cond1: &condition_24x_only (branch is present AND branch = 2.4.x) OR (tag is present AND tag ~= /^2.4/)
-_cond2: &condition_not_24x (branch is not present OR branch != 2.4.x) AND (tag is not present OR tag !~ /^2.4/)
+_cond1: &condition_24x_only (branch is present AND (branch = 2.4.x OR branch ~= /^candidate-2.4/)) OR (tag is present AND tag ~= /^2.4/)
+_cond2: &condition_not_24x (branch is not present OR (branch != 2.4.x AND branch !~ /^candidate-2.4/)) AND (tag is not present OR tag !~ /^2.4/)
 
 jobs:
   include:
diff --git a/test/test_travis_conditions.sh b/test/test_travis_conditions.sh
new file mode 100755
index 00000000000..32f663ae25d
--- /dev/null
+++ b/test/test_travis_conditions.sh
@@ -0,0 +1,39 @@
+#!/bin/sh -e
+# Script to test whether travis conditions match correctly.
+# "gem install travis-conditions". Tests .travis.yml in the cwd.
+
+cond_24x="`sed -n '/&condition_24x_only/{s/.*condition_24x_only//;p;q;}' .travis.yml`"
+cond_not_24x="`sed -n '/&condition_not_24x/{s/.*condition_not_24x//;p;q;}' .travis.yml`"
+
+echo Condition 2.4.x: ${cond_24x}
+echo Condition not 2.4.x: ${cond_not_24x}
+
+function testit()
+{
+    local data=$1
+    local expect=$2
+
+    is_24x=`travis-conditions eval "$cond_24x" --data "${data}"`
+    not_24x=`travis-conditions eval "$cond_not_24x" --data "${data}"`
+
+    if [ $is_24x = $not_24x ]; then
+        echo FAIL: Tests as both 2.4.x and not 2.4.x for "$data"
+        return 1
+    elif [ $expect = 2.4.x -a $is_24x = true ]; then
+        echo PASS
+    elif [ $expect = trunk ]; then
+        echo PASS
+    else
+        echo FAIL for "$data"
+        return 1
+    fi
+    return 0
+}
+
+testit '{"tag": "2.4.49"}' 2.4.x
+testit '{"tag": "2.5.59"}' trunk
+testit '{"branch": "2.4.x"}' 2.4.x
+testit '{"branch": "candidate-2.4.49"}' 2.4.x
+testit '{"branch": "2.5.0"}' trunk
+testit '{"branch": "2.5.x"}' trunk
+testit '{"branch": "trunk"}' trunk