Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Tester makefile also use ant silently

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-01-28 14:08:22 +01:00
parent 9708d82802
commit d1d72b7157
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -467,11 +467,11 @@ run-liblinphone-tests: liblinphone_tester
run-basic-tests: update-project
$(ANT) partial-clean
$(MAKE) -C tests run-basic-tests
$(MAKE) -C tests run-basic-tests ANT_SILENT=$(ANT_SILENT)
run-all-tests: update-project
$(ANT) partial-clean
$(MAKE) -C tests run-all-tests
$(MAKE) -C tests run-all-tests ANT_SILENT=$(ANT_SILENT)
clean-ndk-build:
- $(NDK_PATH)/ndk-build clean $(LIBLINPHONE_OPTIONS)

11
tests/Makefile
View file

@ -1,5 +1,12 @@
SDK_PATH=$(shell dirname `which android`)
SDK_PLATFORM_TOOLS_PATH=$(shell dirname `which adb`)
ANT_SILENT=1
ifeq ($(ANT_SILENT), 1)
ANT=ant -e -S
else
ANT=ant -e
endif
clean:
$(SDK_PLATFORM_TOOLS_PATH)/adb uninstall org.linphone.test
@ -7,10 +14,10 @@ clean:
$(SDK_PATH)/android update test-project --path . -m ../
all: clean
ant debug install
$(ANT) debug install
run-basic-tests: all
ant test
$(ANT) test
adb shell run-as org.linphone cat /data/data/org.linphone/files/junit-report.xml 2>/dev/null > linphone-junit-report.xml
if [ ! -s linphone-junit-report.xml ]; then exit 1; fi