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

Unified Diff: ports/yajl/build.sh

Issue 1556933002: Remove redundant pnacl translations (Closed) Base URL: https://chromium.googlesource.com/webports.git@master
Patch Set: Created 4 years, 12 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
Index: ports/yajl/build.sh
diff --git a/ports/yajl/build.sh b/ports/yajl/build.sh
index 9f84b641e988e5bb8a6e0888878e39e23e40448d..18b11942248a25ff957f23163215c564f2702e9e 100644
--- a/ports/yajl/build.sh
+++ b/ports/yajl/build.sh
@@ -7,13 +7,13 @@ EXTRA_CMAKE_ARGS="-DBUILD_SHARED=${NACL_SHARED}"
TestStep() {
local script=${BUILD_DIR}/test/yajl_test.sh
- if [ ${NACL_ARCH} = "pnacl" ]; then
- local pexe=test/yajl_test
- TranslateAndWriteLauncherScript ${pexe} x86-32 ${pexe}.x86-32.nexe "${script}"
- (cd "${SRC_DIR}/test" && ./run_tests.sh "${script}")
- TranslateAndWriteLauncherScript ${pexe} x86-64 ${pexe}.x86-64.nexe "${script}"
+ (cd "${SRC_DIR}/test" && ./run_tests.sh "${script}")
+
+ if [[ ${NACL_ARCH} == pnacl ]]; then
+ # Re-run the tests with the x86-32 and arm translated binaries
+ WriteLauncherScript ${script} yajl_test.x86-32.nexe
(cd "${SRC_DIR}/test" && ./run_tests.sh "${script}")
- else
+ WriteLauncherScript ${script} yajl_test.arm.nexe
(cd "${SRC_DIR}/test" && ./run_tests.sh "${script}")
fi
}
« ports/jpeg6b/build.sh ('K') | « ports/ruby/build.sh ('k') | ports/zlib/build.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698