accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [4/5] git commit: ACCUMULO-1852 Further fixes nativemap test on OSX
Date Thu, 05 Dec 2013 17:34:42 GMT
ACCUMULO-1852 Further fixes nativemap test on OSX

To make it work on my system I had to add this bit
to the include path for executing the test.

Signed-off-by: Josh Elser <elserj@apache.org>


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

Branch: refs/heads/master
Commit: f0c12cd04761b40b4642b9a03640c11ee72ce0e0
Parents: 1bddc57
Author: Michael Allen <michael@sqrrl.com>
Authored: Thu Dec 5 10:48:01 2013 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Thu Dec 5 12:31:01 2013 -0500

----------------------------------------------------------------------
 server/native/src/main/resources/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f0c12cd0/server/native/src/main/resources/Makefile
----------------------------------------------------------------------
diff --git a/server/native/src/main/resources/Makefile b/server/native/src/main/resources/Makefile
index c9bdc91..ffe5f24 100644
--- a/server/native/src/main/resources/Makefile
+++ b/server/native/src/main/resources/Makefile
@@ -45,7 +45,7 @@ testJavaHome :
 	@echo JAVA_HOME is $(JAVA_HOME)
 
 runTests : $(NATIVE_LIB) $(TESTSRCS)
-	$(CXX) -g -Wall -I/System/Library/Frameworks/JavaVM.framework/Headers -I$(JAVA_HOME)/include
-I$(JAVA_HOME)/include/linux -InativeMap -o $@ $(TESTSRCS) $(NATIVE_LIB) $(MAVERICK_FLAGS)
+	$(CXX) -g -Wall -I/System/Library/Frameworks/JavaVM.framework/Headers -I$(JAVA_HOME)/include
-I$(JAVA_HOME)/include/linux -I$(JAVA_HOME)/include/darwin -InativeMap -o $@ $(TESTSRCS) $(NATIVE_LIB)
$(MAVERICK_FLAGS)
 	LD_LIBRARY_PATH=./ ./$@ 20 20 20 20 20 20 20 20 true
 
 clean :


Mime
View raw message