svn commit: r1892845 - in /httpd/httpd/trunk: .travis.yml test/test_travis_conditions.sh

[jo...@apache.org]

Author: jorton
Date: Fri Sep  3 08:31:42 2021
New Revision: 1892845

URL: http://svn.apache.org/viewvc?rev=1892845&view=rev
Log:
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.

Added:
    httpd/httpd/trunk/test/test_travis_conditions.sh   (with props)
Modified:
    httpd/httpd/trunk/.travis.yml

Modified: httpd/httpd/trunk/.travis.yml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/.travis.yml?rev=1892845&r1=1892844&r2=1892845&view=diff
==============================================================================
--- httpd/httpd/trunk/.travis.yml (original)
+++ httpd/httpd/trunk/.travis.yml Fri Sep  3 08:31:42 2021
@@ -38,8 +38,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/ OR tag ~= /^candidate-2.4/))
-_cond2: &condition_not_24x (branch is not present OR branch != 2.4.x) AND (tag is not present OR (tag !~ /^2.4/ AND tag !~ /^candidate-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:

Added: httpd/httpd/trunk/test/test_travis_conditions.sh
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/test_travis_conditions.sh?rev=1892845&view=auto
==============================================================================
--- httpd/httpd/trunk/test/test_travis_conditions.sh (added)
+++ httpd/httpd/trunk/test/test_travis_conditions.sh Fri Sep  3 08:31:42 2021
@@ -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

Propchange: httpd/httpd/trunk/test/test_travis_conditions.sh
------------------------------------------------------------------------------
    svn:executable = *