Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2314)

Unified Diff: ports/devenv/build.sh

Issue 1555913002: Build gtest from source rather than using SDK-provided version (Closed) Base URL: https://chromium.googlesource.com/webports.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ports/corelibs/build.sh ('k') | ports/devenv/pkg_info » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ports/devenv/build.sh
diff --git a/ports/devenv/build.sh b/ports/devenv/build.sh
index 3596d3044f170cdfe474d7bbbf764f14a7598a1c..c6185754ea9a645f12548c321f0ff2ad7b7aa920 100644
--- a/ports/devenv/build.sh
+++ b/ports/devenv/build.sh
@@ -4,6 +4,7 @@
EnableCliMain
NACLPORTS_CPPFLAGS+=" -Wall -Werror -Dpipe=nacl_spawn_pipe"
+NACLPORTS_CPPFLAGS+=" -isystem ${GTEST_SRC}/include"
EXECUTABLES="tests/devenv_small_test_${NACL_ARCH}${NACL_EXEEXT} \
jseval/jseval_${NACL_ARCH}${NACL_EXEEXT}"
@@ -25,11 +26,13 @@ BuildStep() {
${LIBS}
# Build test module.
- MakeDir ${BUILD_DIR}/tests
- LogExecute ${CXX} ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} \
- ${START_DIR}/tests/devenv_small_test.cc \
- -o ${BUILD_DIR}/tests/devenv_small_test_${NACL_ARCH}${NACL_EXEEXT} \
- -lgtest ${LIBS}
+ MakeDir tests
+ LogExecute ${CXX} ${CPPFLAGS} ${CXXFLAGS} -o tests/devenv_small_test.o \
+ -c ${START_DIR}/tests/devenv_small_test.cc
+ LogExecute ${CXX} ${CPPFLAGS} ${CXXFLAGS} -o tests/gtest-all.o \
+ -c ${GTEST_SRC}/src/gtest-all.cc -I${GTEST_SRC}
+ LogExecute ${CXX} ${LDFLAGS} tests/devenv_small_test.o tests/gtest-all.o \
+ -o tests/devenv_small_test_${NACL_ARCH}${NACL_EXEEXT} ${LIBS}
}
InstallStep() {
@@ -161,16 +164,9 @@ PublishStep() {
LogExecute cp -r ${START_DIR}/devenvwidget/* ${WIDGET_DIR}
# Install tests.
- MakeDir ${PUBLISH_DIR}/tests
- LogExecute cp -r ${BUILD_DIR}/tests/* ${PUBLISH_DIR}/tests
- cd ${PUBLISH_DIR}/tests
- if [[ ${NACL_ARCH} == pnacl ]]; then
- LogExecute ${PNACLFINALIZE} devenv_small_test_${NACL_ARCH}${NACL_EXEEXT}
- fi
- LogExecute python ${NACL_SDK_ROOT}/tools/create_nmf.py \
- devenv_small_test_${NACL_ARCH}${NACL_EXEEXT} \
- -s . \
- -o devenv_small_test.nmf
+ MakeDir tests
+ ChangeDir tests
+ LogExecute cp -r ${BUILD_DIR}/tests/*${NACL_EXEEXT} .
LogExecute mv devenv_small_test_${NACL_ARCH}${NACL_EXEEXT} \
devenv_small_test_${NACL_ARCH}
« no previous file with comments | « ports/corelibs/build.sh ('k') | ports/devenv/pkg_info » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698