subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1639612 - /subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svncheck.sh
Date Fri, 14 Nov 2014 11:44:33 GMT
Author: brane
Date: Fri Nov 14 11:44:33 2014
New Revision: 1639612

URL: http://svn.apache.org/r1639612
Log:
Add support for building different FS versions to the macosx builder.

* tools/buildbot/slaves/svn-x64-macosx/svncheck.sh:
  (check_tests): New function; run all test variants for one RA type
  (check_fsfs_v6, check_fsfs_v4, check_fsx): New predicates.

Modified:
    subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svncheck.sh

Modified: subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svncheck.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svncheck.sh?rev=1639612&r1=1639611&r2=1639612&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svncheck.sh (original)
+++ subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svncheck.sh Fri Nov 14 11:44:33
2014
@@ -41,6 +41,16 @@ run_tests() {
     ${ok} || exit 1
 }
 
+check_tests() {
+    ra="$1"
+
+    ${check_fsfs} && run_tests ${ra} fsfs
+    ${check_fsfs_v6} && run_tests ${ra} fsfs-v6
+    ${check_fsfs_v4} && run_tests ${ra} fsfs-v4
+    ${check_bdb} && run_tests ${ra} bdb
+    ${check_fsx} && run_tests ${ra} fsx
+}
+
 
 set -x
 
@@ -53,16 +63,22 @@ check_local=false
 check_svn=false
 check_dav=false
 check_fsfs=false
+check_fsfs_v6=false
+check_fsfs_v4=false
+check_fsx=false
 check_bdb=false
 
 while [ ! -z "$1" ]; do
     case "$1" in
-        local) check_local=true;;
-        svn)   check_svn=true;;
-        dav)   check_dav=true;;
-        fsfs)  check_fsfs=true;;
-        bdb)   check_bdb=true;;
-        *)     exit 1;;
+        local)   check_local=true;;
+        svn)     check_svn=true;;
+        dav)     check_dav=true;;
+        fsfs)    check_fsfs=true;;
+        fsfs-v6) check_fsfs_v6=true;;
+        fsfs-v4) check_fsfs_v6=true;;
+        fsx)     check_fsx=true;;
+        bdb)     check_bdb=true;;
+        *)       exit 1;;
     esac
     shift
 done
@@ -74,19 +90,8 @@ fi
 mkdir "${abssrc}/.test-logs" || exit 1
 
 
-${check_local} && {
-    ${check_fsfs} && run_tests local fsfs
-    ${check_bdb} && run_tests local bdb
-}
-
-${check_svn} && {
-    ${check_fsfs} && run_tests svn fsfs
-    ${check_bdb} && run_tests svn bdb
-}
-
-${check_dav} && {
-    ${check_fsfs} && run_tests dav fsfs
-    ${check_bdb} && run_tests dav bdb
-}
+${check_local} && check_tests local
+${check_svn} && check_tests svn
+${check_dav} && check_tests dav
 
 exit 0



Mime
View raw message