Travis-CI OS X improvements:

* Enable system curl, system c-ares and local curl tests
* Disable IRC test framework for now

diff --git a/extras/build-tests/nix/build b/extras/build-tests/nix/build
index 44fea56d70c7c46ebbcb71e4543bdf2a1e79f75a..deb3b75e75d36c3c06b18bce9f204790199848c6 100755 (executable)
--- a/extras/build-tests/nix/build
+++ b/extras/build-tests/nix/build
@@ -33,6 +33,12 @@ if [ "$BUILDCONFIG" = "local-curl" ]; then
        exit 0
 fi
 
+if [[ "$OSTYPE" == "darwin"* ]]; then
+       # 'rake' doesn't work. have to figure that one out..
+       echo "Not running test on OS X for now"
+       exit 0
+fi
+
 echo ""
 echo ""
 echo "Now running UnrealIRCd test framework..."

diff --git a/extras/build-tests/nix/select-config b/extras/build-tests/nix/select-config
index cd28520f8983f9622ef44d8f21d758ac48d54f80..494de1a6052b7ba641dad30673085fcea4226755 100755 (executable)
--- a/extras/build-tests/nix/select-config
+++ b/extras/build-tests/nix/select-config
@@ -41,7 +41,7 @@ do
                elif [[ "$OSTYPE" == "freebsd"* ]]; then
                        sudo pkg install -y c-ares
                elif [[ "$OSTYPE" == "darwin"* ]]; then
-                       echo TODO: Do something useful here...
+                       brew install c-ares
                fi
        elif [ "$1" = "system-curl" ]; then
                echo 'REMOTEINC=1' >>config.settings
@@ -52,7 +52,7 @@ do
                        sudo pkg install -y curl
                        echo 'CURLDIR=/usr/local' >>config.settings
                elif [[ "$OSTYPE" == "darwin"* ]]; then
-                       echo TODO: Do something useful here...
+                       brew install c-ares curl
                fi
        elif [ "$1" = "local-curl" ]; then
                if [ "$OSTYPE" = "linux-gnu" ]; then
@@ -60,7 +60,7 @@ do
                elif [[ "$OSTYPE" == "freebsd"* ]]; then
                        sudo pkg remove -y curl #NOTE: unfortunately this also removes 'git' :D
                elif [[ "$OSTYPE" == "darwin"* ]]; then
-                       echo TODO: Do something useful here...
+                       echo "No need to remove curl since it's not installed. Or at least I hope so..."
                fi
                echo 'REMOTEINC=1' >>config.settings
                echo "CURLDIR=`pwd`/extras/curl" >>config.settings