gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test script modifications

Browse Source
This commit is contained in:
Joseph Henry
2016-08-29 17:00:22 -07:00
parent 30fff57b2f
commit a8262fd6c0
4 changed files with 49 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
make-linux.mk
View File

@@ -78,14 +78,21 @@ android_jni_lib:
mv -f $(INT)/android/android_jni_lib/java/libs/* $(BUILD)/android_jni_lib
cp -R $(BUILD)/android_jni_lib/* $(INT)/android/example_app/app/src/main/jniLibs
lwip:
make -f make-liblwip.mk $(LWIP_FLAGS)
# Builds libztlinux.so (full bundle)
linux_shared_lib:
linux_intercept:
# Use gcc not clang to build standalone intercept library since gcc is typically used for libc and we want to ensure maximal ABI compatibility
cd src ; gcc $(DEFS) -O2 -Wall -std=c99 -fPIC -DVERBOSE -D_GNU_SOURCE -DSDK_INTERCEPT -I. -I../$(ZT1)/node -nostdlib -shared -o ../$(BUILD)/libztintercept.so SDK_Sockets.c SDK_Intercept.c SDK_Debug.c SDK_RPC.c -ldl
# Build a dynamically-loadable library
linux_shared_lib: $(OBJS)
mkdir -p $(BUILD)/linux_shared_lib
linux_service_and_intercept: lwip linux_intercept $(OBJS)
mkdir -p $(BUILD)/linux_intercept
$(CXX) $(CXXFLAGS) $(LDFLAGS) $(DEFS) -DSDK -DZT_ONE_NO_ROOT_CHECK -Iext/lwip/src/include -Iext/lwip/src/include/ipv4 -Iext/lwip/src/include/ipv6 -I$(ZT1)/osdep -I$(ZT1)/node -Isrc -o $(BUILD)/zerotier-sdk-service $(OBJS) $(ZT1)/service/OneService.cpp src/SDK_EthernetTap.cpp src/SDK_Proxy.cpp $(ZT1)/one.cpp -x c src/SDK_RPC.c $(LDLIBS) -ldl
# Build liblwip.so which must be placed in ZT home for zerotier-netcon-service to work
make -f make-liblwip.mk $(LWIP_FLAGS)
# Use gcc not clang to build standalone intercept library since gcc is typically used for libc and we want to ensure maximal ABI compatibility
cd src ; gcc $(DEFS) -O2 -Wall -std=c99 -fPIC -DVERBOSE -D_GNU_SOURCE -DSDK_INTERCEPT -I. -I../$(ZT1)/node -nostdlib -shared -o ../$(BUILD)/linux_shared_lib/libztintercept.so SDK_Sockets.c SDK_Intercept.c SDK_Debug.c SDK_RPC.c -ldl
ln -sf zerotier-sdk-service $(BUILD)/zerotier-cli
ln -sf zerotier-sdk-service $(BUILD)/zerotier-idtool
@@ -144,10 +151,10 @@ check:
# Tests
TEST_OBJDIR := $(BUILD)/tests
TEST_SOURCES := $(wildcard tests/*.c)
TEST_SOURCES := $(wildcard tests/api_test/*.c)
TEST_TARGETS := $(addprefix $(BUILD)/tests/$(OSTYPE).,$(notdir $(TEST_SOURCES:.c=.out)))
$(BUILD)/tests/$(OSTYPE).%.out: tests/%.c
$(BUILD)/tests/$(OSTYPE).%.out: tests/api_test/%.c
-$(CC) $(CC_FLAGS) -o $@ $<
$(TEST_OBJDIR):
@@ -156,12 +163,31 @@ $(TEST_OBJDIR):
tests: $(TEST_OBJDIR) $(TEST_TARGETS)
mkdir -p $(BUILD)/tests;
clean:
tests: $(TEST_OBJDIR) $(TEST_TARGETS) linux_service_and_intercept
mkdir -p $(BUILD)/tests;
mkdir -p build/tests/zerotier
cp tests/api_test/test.sh $(BUILD)/tests/test.sh
cp tests/api_test/servers.sh $(BUILD)/tests/servers.sh
cp tests/api_test/clients.sh $(BUILD)/tests/clients.sh
cp tests/cleanup.sh $(BUILD)/tests/cleanup.sh
cp $(BUILD)/lwip/liblwip.so $(BUILD)/tests/zerotier/liblwip.so
clean_android:
# android JNI lib project
test -s /usr/bin/javac || { echo "Javac not found"; exit 1; }
-cd $(INT)/android/android_jni_lib/proj; ./gradlew clean
-rm -rf $(INT)/android/android_jni_lib/proj/build
# example android app project
-cd $(INT)/android/example_app; ./gradlew clean
clean_basic:
-rm -rf $(BUILD)/*
-rm -rf $(INT)/Unity3D/Assets/Plugins/*
-rm -rf zerotier-cli zerotier-idtool
-find . -type f \( -name 'zerotier-one' -o -name 'zerotier-sdk-service' \) -delete
-find . -type f \( -name '*.o' -o -name '*.so' -o -name '*.o.d' -o -name '*.out' -o -name '*.log' \) -delete
# Remove junk generated by Android builds
-cd $(INT)/android/android_jni_lib/proj; ./gradlew clean
-rm -rf $(INT)/android/android_jni_lib/proj/build
-find . -type f \( -name '*.o' -o -name '*.so' -o -name '*.o.d' -o -name '*.out' -o -name '*.log' -o -name '*.dSYM' \) -delete
clean: clean_basic clean_android
clean_for_production:
-find . -type f \( -name '*.identity'\) -delete