You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2012/12/03 05:43:58 UTC

[2/2] git commit: Use gmake on FreeBSD in regression script

Use gmake on FreeBSD in regression script


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/fe74191c
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/fe74191c
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/fe74191c

Branch: refs/heads/master
Commit: fe74191c713eb7f41efc03b7d8a959c5dcf35fb0
Parents: db0cfd4
Author: James Peach <jp...@apache.org>
Authored: Sun Dec 2 20:23:20 2012 -0800
Committer: James Peach <jp...@apache.org>
Committed: Sun Dec 2 20:23:20 2012 -0800

----------------------------------------------------------------------
 ci/regression |   37 ++++++++++++++++++++++++++++++-------
 1 files changed, 30 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fe74191c/ci/regression
----------------------------------------------------------------------
diff --git a/ci/regression b/ci/regression
index 858ec34..5fe793c 100755
--- a/ci/regression
+++ b/ci/regression
@@ -41,10 +41,28 @@ mkdir -p $SRCROOT
 mkdir -p $OBJROOT
 mkdir -p $DSTROOT
 
-case $(uname) in
-  Darwin) CC=${CC:-clang}; CXX=${CXX:-clang++} ;;
-  *) CC=${CC:-cc}; CXX=${CXX:-c++} ;;
-esac
+prog() {
+  case $1 in
+    cc)
+      case $(uname) in
+        Darwin) echo clang ;;
+        *) echo cc ;;
+      esac
+      ;;
+    cxx)
+      case $(uname) in
+        Darwin) echo clang++ ;;
+        *) echo c++ ;;
+      esac
+      ;;
+    make)
+      case $(uname) in
+        FreeBSD) echo gmake ;;
+        *) echo make ;;
+      esac
+      ;;
+  esac
+}
 
 autogen() {
   [[ -e "$SRCROOT/configure" ]] || ( cd $SRCROOT && autoreconf -fi )
@@ -65,15 +83,20 @@ configure() {
 }
 
 build() {
-  ( cd $OBJROOT && make -j $NPROCS )
-  ( cd $OBJROOT && make install )
+  ( cd $OBJROOT && $MAKE -j $NPROCS )
+  ( cd $OBJROOT && $MAKE install )
 }
 
 regress() {
-  ( cd $OBJROOT && make check )
+  ( cd $OBJROOT && $MAKE check )
   $DSTROOT/bin/traffic_server -R 1
 }
 
+CC=${CC:-$(prog cc)}
+CXX=${CXX:-$(prog cxx)}
+MAKE=${MAKE:-$(prog make)}
+export CC CXX MAKE
+
 autogen
 configure
 build