Build gtest from source rather than using SDK-provided version

ports/devenv/build.sh

 # Copyright (c) 2014 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 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}"
 
 STORAGE_URL=https://naclports.storage.googleapis.com/builds
 SDK_VERSION=pepper_48
 BUILT_REVISION=trunk-703-gdb4edd8
 DEFAULT_SOURCE=${STORAGE_URL}/${SDK_VERSION}/${BUILT_REVISION}/publish
 LOCAL_SOURCE=http://localhost:5103
 
 BuildStep() {
   SetupCrossEnvironment
 
   # Build jseval module.
   MakeDir ${BUILD_DIR}/jseval
   LogExecute ${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} \
       ${START_DIR}/jseval.c \
       -o ${BUILD_DIR}/jseval/jseval_${NACL_ARCH}${NACL_EXEEXT} \
       ${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}
+  LogExecute ${CXX} ${CPPFLAGS} ${CXXFLAGS} -o devenv_small_test.o \

[binji, 2016/01/04 19:12:54]

what directory does this write to? It used to prefix with ${BUILD_DIR}

[Sam Clegg, 2016/01/05 12:41:14]

The CWD in the BuildStep is BUILD_DIR so it was redundant.

+      -c ${START_DIR}/tests/devenv_small_test.cc
+  LogExecute ${CXX} ${CPPFLAGS} ${CXXFLAGS} -o gtest-all.o \
+      -c ${GTEST_SRC}/src/gtest-all.cc -I${GTEST_SRC}
+
+  LogExecute ${CXX} ${LDFLAGS} devenv_small_test.o gtest-all.o ${LIBS} \
+      -o devenv_small_test_${NACL_ARCH}${NACL_EXEEXT}
+
+  if [[ ${NACL_ARCH} == pnacl ]]; then
+    LogExecute ${PNACLFINALIZE} devenv_small_test_${NACL_ARCH}${NACL_EXEEXT}
+  fi
 }
 
 InstallStep() {
   return
 }
 
 #
 # $1: Name name of the repo
 # $2: Name of directory in which to create the conf file.
 # $3: The http address of repo.
@@ skipping 112 matching lines @@
   ChangeDir ${PUBLISH_DIR}
   CreateWebStoreZip devenv_app_upload.zip devenv_app_upload
 
   # Copy the files for DevEnvWidget.
   local WIDGET_DIR=${PUBLISH_DIR}/devenvwidget
   MakeDir ${WIDGET_DIR}
   LogExecute cp -r ${START_DIR}/devenvwidget/* ${WIDGET_DIR}
 
   # Install tests.
   MakeDir ${PUBLISH_DIR}/tests
-  LogExecute cp -r ${BUILD_DIR}/tests/* ${PUBLISH_DIR}/tests
+  LogExecute cp -r ${BUILD_DIR}/tests/*${NACL_EXEEXT} ${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
   LogExecute mv devenv_small_test_${NACL_ARCH}${NACL_EXEEXT} \
       devenv_small_test_${NACL_ARCH}
 
   Remove devenv_small_test.zip
   LogExecute zip -r devenv_small_test.zip *
 }
@@ skipping 16 matching lines @@
     fi
     # Run large and io2014 tests only on the buildbots (against pinned revs).
     if [[ -n ${BUILDBOT_BUILDERNAME:-} ]]; then
       LogExecute python ${START_DIR}/../devenv/devenv_large_test.py \
         -x -v -a ${arch}
       #LogExecute python ${START_DIR}/../devenv/io2014_test.py \
         #-x -v -a ${arch}
     fi
   done
 }