Browse Source

test/Makefile.conf for common build information for all tests

Included after main Makefile.conf.
JNI-88
heck 3 years ago
parent
commit
08f4061962
3 changed files with 20 additions and 27 deletions
  1. +1
    -22
      test/Basic/Makefile
  2. +1
    -5
      test/JNI_85/Makefile
  3. +18
    -0
      test/Makefile.conf

+ 1
- 22
test/Basic/Makefile View File

@ -1,36 +1,15 @@
include ../../Makefile.conf
$(info If on Mac, make sure to disable SIP, or copy the libpEpEngine.dylib into here)
ifdef ENGINE_LIB_PATH
ifeq ($(BUILD_FOR),Linux)
ifndef LD_LIBRARY_PATH
export LD_LIBRARY_PATH=$(ENGINE_LIB_PATH)
endif
else ifeq ($(BUILD_FOR),Darwin)
ifndef DYLD_LIBRARY_PATH
export DYLD_LIBRARY_PATH=$(ENGINE_LIB_PATH)
endif
endif
endif
CLASSPATH=.:../../src
VM=java -Xcheck:jni -Djava.library.path=../../src
#VM=lldb java -- -Xcheck:jni -Djava.library.path=../src
include ../Makefile.conf
.PHONY: test clean
test: Testing.class SyncCallbacks.class
HOME=$(PWD) CLASSPATH=$(CLASSPATH) time $(VM) Testing
test-JNI-85:
$(MAKE) -C JNI_85
%.class: %.java
CLASSPATH=$(CLASSPATH) javac $<
clean:
$(MAKE) -C JNI_85 clean
rm -f *.class
rm -f *.log
rm -f .pEp_*


+ 1
- 5
test/JNI_85/Makefile View File

@ -1,13 +1,9 @@
include ../../Makefile.conf
include ../Makefile.conf
#TODO: Remove when successufuly reproduce the error, and then use it to avoid regression
$(info This is to be run using pEpJNIAdapter 626)
CLASSPATH=.:../../src
VM=java -Xcheck:jni -Djava.library.path=../../src
#VM=lldb java -- -Xcheck:jni -Djava.library.path=../src
.PHONY: test clean
test: SyncCallbacks.class Step1.class Step2.class


+ 18
- 0
test/Makefile.conf View File

@ -0,0 +1,18 @@
$(info If on Mac, make sure to disable SIP, or copy the libpEpEngine.dylib into here)
ifdef ENGINE_LIB_PATH
ifeq ($(BUILD_FOR),Linux)
ifndef LD_LIBRARY_PATH
export LD_LIBRARY_PATH=$(ENGINE_LIB_PATH)
endif
else ifeq ($(BUILD_FOR),Darwin)
ifndef DYLD_LIBRARY_PATH
export DYLD_LIBRARY_PATH=$(ENGINE_LIB_PATH)
endif
endif
endif
CLASSPATH=.:../../src
VM=java -Xcheck:jni -Djava.library.path=../../src
#VM=lldb java -- -Xcheck:jni -Djava.library.path=../src

Loading…
Cancel
Save