commit af909fcc138ce18bd433edecc248ed2b60fc9737
author Vince Lehman <vslehman@memphis.edu> Mon Jan 11 12:26:59 2016 -0600
committer Vince Lehman <vslehman@memphis.edu> Thu Jan 14 10:33:22 2016 -0600
tree c7574ca09a70c647dc86b599a8a5432499b2d98b
parent c69da0a350e7e195256547109d44cbb5fff88461

build: Don't install unit tests; use brew version of openssl on OS X Jenkins

refs: #3359

Change-Id: I0b51ede8be0abafe4cbbe39274b291d3c8549872

.jenkins.d/01-dependencies.sh

diff --git a/.jenkins.d/01-dependencies.sh b/.jenkins.d/01-dependencies.sh
index d661122..5c6c0d5 100755
--- a/.jenkins.d/01-dependencies.sh
+++ b/.jenkins.d/01-dependencies.sh
@@ -10,6 +10,7 @@
     brew update
     brew upgrade
     brew install boost pkg-config sqlite cryptopp log4cxx protobuf openssl
+    brew link --force openssl
     brew cleanup
 fi
 

tests/wscript

diff --git a/tests/wscript b/tests/wscript
index 3f3cbaf..f652cea 100644
--- a/tests/wscript
+++ b/tests/wscript
@@ -39,7 +39,7 @@
             source=bld.path.ant_glob(['nsync/**/*.cc']),
             use='nsync-objects unit-tests-main',
             includes='.',
-            install_prefix=None,
+            install_path=None,
           )
 
         # nlsr tests
@@ -49,5 +49,5 @@
             source=bld.path.ant_glob(['nlsr/**/*.cpp']),
             use='nlsr-objects unit-tests-main',
             includes='.',
-            install_prefix=None,
+            install_path=None,
           )