OLD | NEW |
---|---|
1 # Copyright (c) 2014 The Native Client Authors. All rights reserved. | 1 # Copyright (c) 2014 The Native Client Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 EnableCliMain | 5 EnableCliMain |
6 NACLPORTS_CPPFLAGS+=" -Wall -Werror -Dpipe=nacl_spawn_pipe" | 6 NACLPORTS_CPPFLAGS+=" -Wall -Werror -Dpipe=nacl_spawn_pipe" |
7 NACLPORTS_CPPFLAGS+=" -isystem ${GTEST_SRC}/include" | 7 NACLPORTS_CPPFLAGS+=" -isystem ${GTEST_SRC}/include" |
8 | 8 |
9 EXECUTABLES="tests/devenv_small_test_${NACL_ARCH}${NACL_EXEEXT} \ | 9 EXECUTABLES="tests/devenv_small_test_${NACL_ARCH}${NACL_EXEEXT} \ |
10 jseval/jseval_${NACL_ARCH}${NACL_EXEEXT}" | 10 jseval/jseval_${NACL_ARCH}${NACL_EXEEXT}" |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
99 local PKG_DIR=${NACL_PACKAGES_PUBLISH}/pkg/${TOOLCHAIN} | 99 local PKG_DIR=${NACL_PACKAGES_PUBLISH}/pkg/${TOOLCHAIN} |
100 local GETURL_DIR=${NACL_PACKAGES_PUBLISH}/geturl/${TOOLCHAIN} | 100 local GETURL_DIR=${NACL_PACKAGES_PUBLISH}/geturl/${TOOLCHAIN} |
101 local UNZIP_DIR=${NACL_PACKAGES_PUBLISH}/unzip/${TOOLCHAIN} | 101 local UNZIP_DIR=${NACL_PACKAGES_PUBLISH}/unzip/${TOOLCHAIN} |
102 | 102 |
103 LogExecute cp -fR ${BASH_DIR}/* ${APP_DIR} | 103 LogExecute cp -fR ${BASH_DIR}/* ${APP_DIR} |
104 LogExecute cp -fR ${PKG_DIR}/* ${APP_DIR} | 104 LogExecute cp -fR ${PKG_DIR}/* ${APP_DIR} |
105 LogExecute cp -fR ${GETURL_DIR}/* ${APP_DIR} | 105 LogExecute cp -fR ${GETURL_DIR}/* ${APP_DIR} |
106 LogExecute cp -fR ${UNZIP_DIR}/* ${APP_DIR} | 106 LogExecute cp -fR ${UNZIP_DIR}/* ${APP_DIR} |
107 | 107 |
108 # Install jseval only for pnacl (as it can't really work otherwise). | 108 # Install jseval only for pnacl (as it can't really work otherwise). |
109 if [[ ${NACL_ARCH} == pnacl ]]; then | 109 if [[ ${NACL_ARCH} == pnacl || ${NACL_ARCH} == le32 ]]; then |
110 LogExecute ${PNACLFINALIZE} \ | 110 LogExecute ${PNACLFINALIZE} \ |
111 ${BUILD_DIR}/jseval/jseval_${NACL_ARCH}${NACL_EXEEXT} \ | 111 ${BUILD_DIR}/jseval/jseval_${NACL_ARCH}${NACL_EXEEXT} \ |
112 -o ${APP_DIR}/jseval_${NACL_ARCH}${NACL_EXEEXT} | 112 -o ${APP_DIR}/jseval_${NACL_ARCH}${NACL_EXEEXT} |
113 cd ${APP_DIR} | 113 cd ${APP_DIR} |
114 LogExecute python ${NACL_SDK_ROOT}/tools/create_nmf.py \ | 114 LogExecute python ${NACL_SDK_ROOT}/tools/create_nmf.py \ |
115 jseval_${NACL_ARCH}${NACL_EXEEXT} \ | 115 jseval_${NACL_ARCH}${NACL_EXEEXT} \ |
116 -s . \ | 116 -s . \ |
117 -o jseval.nmf | 117 -o jseval.nmf |
118 fi | 118 fi |
119 | 119 |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
173 Remove devenv_small_test.zip | 173 Remove devenv_small_test.zip |
174 LogExecute zip -r devenv_small_test.zip * | 174 LogExecute zip -r devenv_small_test.zip * |
175 } | 175 } |
176 | 176 |
177 PostInstallTestStep() { | 177 PostInstallTestStep() { |
178 local arches= | 178 local arches= |
179 if [[ ${OS_NAME} == Darwin && ${NACL_ARCH} == x86_64 ]]; then | 179 if [[ ${OS_NAME} == Darwin && ${NACL_ARCH} == x86_64 ]]; then |
180 echo "Skipping devenv tests on unsupported mac + x86_64 configuration." | 180 echo "Skipping devenv tests on unsupported mac + x86_64 configuration." |
181 elif [[ ${NACL_ARCH} == arm ]]; then | 181 elif [[ ${NACL_ARCH} == arm ]]; then |
182 echo "Skipping devenv tests on arm for now." | 182 echo "Skipping devenv tests on arm for now." |
183 elif [[ ${NACL_ARCH} == pnacl ]]; then | 183 elif [[ ${NACL_ARCH} == pnacl || ${NACL_ARCH} == le32 ]]; then |
184 arches="i686 x86_64" | 184 arches="i686 x86_64" |
185 else | 185 else |
186 arches="${NACL_ARCH}" | 186 arches="${NACL_ARCH}" |
187 fi | 187 fi |
188 for arch in ${arches}; do | 188 for arch in ${arches}; do |
189 LogExecute python ${START_DIR}/devenv_small_test.py -x -v -a ${arch} | 189 LogExecute python ${START_DIR}/devenv_small_test.py -x -v -a ${arch} \ |
190 if [[ ${NACL_ARCH} == pnacl ]]; then | 190 -p NACL_BOOT_ARCH=${NACL_ARCH} |
191 if [[ ${NACL_ARCH} == pnacl || ${NACL_ARCH} == le32 ]]; then | |
191 LogExecute python ${START_DIR}/jseval_test.py -x -v -a ${arch} | 192 LogExecute python ${START_DIR}/jseval_test.py -x -v -a ${arch} |
192 fi | 193 fi |
194 # TODO(anmittal): enable test back once pinned rev is updated for new driver | |
193 # Run large and demo2014 tests only on the buildbots (against pinned revs). | 195 # Run large and demo2014 tests only on the buildbots (against pinned revs). |
194 if [[ -n ${BUILDBOT_BUILDERNAME:-} ]]; then | 196 #if [[ -n ${BUILDBOT_BUILDERNAME:-} ]]; then |
bradnelson
2016/05/02 17:38:58
Can you instead just gate this out for the new arc
Ankur Mittal
2016/05/02 20:22:14
Done.
| |
195 LogExecute python ${START_DIR}/../devenv/devenv_large_test.py \ | 197 # LogExecute python ${START_DIR}/../devenv/devenv_large_test.py \ |
196 -x -v -a ${arch} | 198 # -x -v -a ${arch} |
197 LogExecute python ${START_DIR}/../devenv/demo2014_test.py \ | 199 # LogExecute python ${START_DIR}/../devenv/demo2014_test.py \ |
198 -x -v -a ${arch} | 200 # -x -v -a ${arch} |
199 fi | 201 #fi |
200 done | 202 done |
201 } | 203 } |
OLD | NEW |