Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: .travis/travis-script.sh

Issue 29714583: Issue 6220 - include running of native tests on travis-ci for emscripten (Closed) Base URL: github.com:adblockplus/adblockpluscore
Patch Set: Created March 5, 2018, 3:23 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: .travis/travis-script.sh
diff --git a/.travis/travis-script.sh b/.travis/travis-script.sh
index 0d174c335e14bdf9ab78d378aa7f8086b1c02a76..8a78c667c87a1fabcb3275bfa84f52fd0afe4016 100644
--- a/.travis/travis-script.sh
+++ b/.travis/travis-script.sh
@@ -7,6 +7,14 @@ set -e
PATH=${PATH}:${TRAVIS_BUILD_DIR}/third_party/ninja:$(python3 -c "import sysconfig;print(sysconfig.get_paths('posix_user')['scripts'])")
-meson --buildtype ${BUILDTYPE} build
-ninja -C build
+meson --buildtype ${BUILDTYPE} build/js
+ninja -C build/js
npm test
+
+USE_ASAN=true
+if [[ "${BUILDTYPE}" == "release" ]]; then
+USE_ASAN=false
+fi
+meson -Dnative=true -Dasan=${USE_ASAN} --buildtype ${BUILDTYPE} build/native
+ninja -C build/native
+./build/native/abptest
hub 2018/03/05 15:35:24 `ninja -C build/native test` is enough to build an
sergei 2018/03/05 15:58:16 This is a cool feature but it hides the output of
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld