oxen-io/lokinet
1
1
Fork 0
mirror of https://github.com/oxen-io/lokinet synced 2023-12-14 06:53:00 +01:00
Code Issues Projects Releases Wiki Activity

use fixed path for lokinet-bootstrap

Browse source 
dont run unittest with CROSS=ON
This commit is contained in:
Jeff Becker 2019-03-30 07:40:58 -04:00
parent dce1cfaae1
commit 102875febc
No known key found for this signature in database
GPG key ID: F357B3B42F6F9B05
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -175,7 +175,7 @@ testnet:
$(TEST_EXE): debug
test: $(TEST_EXE)
$(TEST_EXE)
test x$(CROSS) = xOFF && $(TEST_EXE)
android-gradle-prepare:
rm -f $(ANDROID_PROPS)
@ -222,7 +222,7 @@ coverage-config: clean
coverage: coverage-config
$(MAKE) -C $(BUILD_ROOT)
$(TEST_EXE) || true # continue even if tests fail
test x$(CROSS) = xOFF && $(TEST_EXE) || true # continue even if tests fail
mkdir -p "$(COVERAGE_OUTDIR)"
ifeq ($(CLANG),OFF)
gcovr -r . --branches --html --html-details -o "$(COVERAGE_OUTDIR)/lokinet.html"
@ -259,7 +259,7 @@ debian: debian-configure
cp $(EXE) lokinet
debian-test:
$(TEST_EXE) || true
test x$(CROSS) = xOFF && $(TEST_EXE) || true
install:
$(MAKE) -C '$(BUILD_ROOT)' install

3
lokinet-bootstrap
View file

@ -21,7 +21,8 @@ then
fi
# use temp file to not overrwrite existing bootstrap file on fail
tmp=mktemp
#tmp=mktemp
tmp=/tmp/bootstrap.tmp
# MacOS does not have wget without homebrew but does have curl
# Rick also had indicated most BSDs have curl too