diff options
| author | Kai Engert <kaie@kuix.de> | 2013-03-03 19:38:18 +0100 |
|---|---|---|
| committer | Kai Engert <kaie@kuix.de> | 2013-03-03 19:38:18 +0100 |
| commit | a573822fc7c327f8b1771bf50bb5a9d642881934 (patch) | |
| tree | 307da67c331a6aeeb234ddbbd669e78fac6a280c /tests/remote | |
| parent | 6326748975ddf12ae15351ab3eac7f64b97a08ae (diff) | |
| download | nss-hg-a573822fc7c327f8b1771bf50bb5a9d642881934.tar.gz | |
Bug 845556, follow up patch to adjust the Android testing for the new directory layout, r=bustage
Diffstat (limited to 'tests/remote')
| -rw-r--r-- | tests/remote/Makefile | 12 | ||||
| -rw-r--r-- | tests/remote/manifest.mn | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tests/remote/Makefile b/tests/remote/Makefile index 18f88a113..08f1d2b65 100644 --- a/tests/remote/Makefile +++ b/tests/remote/Makefile @@ -95,7 +95,7 @@ ifeq ($(CROSS_COMPILE),1) echo 'echo "signing"' >> $(RTSH) # work around a bug in Android ash that has a corrupted work directory after login echo 'cd $${HOME}/nsstest' >> $(RTSH) - echo 'cd security/nss/cmd/shlibsign' >> $(RTSH) + echo 'cd nss/cmd/shlibsign' >> $(RTSH) echo '$(TEST_SHELL) ./sign.sh $${DIST}/$${OBJDIR}/ $${DIST}/$${OBJDIR}/bin $${OS_TARGET} $${NSPR_LIB_DIR} $${NSPR_LIB_DIR}$${DLL_PREFIX}freebl3.$${DLL_SUFFIX}' >> $(RTSH) echo '$(TEST_SHELL) ./sign.sh $${DIST}/$${OBJDIR}/ $${DIST}/$${OBJDIR}/bin $${OS_TARGET} $${NSPR_LIB_DIR} $${NSPR_LIB_DIR}$${DLL_PREFIX}softokn3.$${DLL_SUFFIX}' >> $(RTSH) echo '$(TEST_SHELL) ./sign.sh $${DIST}/$${OBJDIR}/ $${DIST}/$${OBJDIR}/bin $${OS_TARGET} $${NSPR_LIB_DIR} $${NSPR_LIB_DIR}$${DLL_PREFIX}nssdbm3.$${DLL_SUFFIX}' >> $(RTSH) @@ -104,16 +104,16 @@ ifneq ($(OS_TARGET),Android) echo 'export -n DIST' >> $(RTSH) echo 'export -n NSPR_LIB_DIR' >> $(RTSH) endif - echo 'cd ../../../../' >> $(RTSH) + echo 'cd ../../../' >> $(RTSH) endif echo 'rm -rf tests_results' >> $(RTSH) echo 'echo "running tests"' >> $(RTSH) - echo 'cd security/nss/tests' >> $(RTSH) + echo 'cd nss/tests' >> $(RTSH) # We require progress indication on stdout while running the tests (to avoid timeouts). set -o pipefail - echo '$(TEST_SHELL) ./all.sh | tee ../../../logfile 2>&1 |grep ": #"' >> $(RTSH) + echo '$(TEST_SHELL) ./all.sh | tee ../../logfile 2>&1 |grep ": #"' >> $(RTSH) RETVAL=$? - echo 'cd ../../../' >> $(RTSH) + echo 'cd ../../' >> $(RTSH) # dump test summary from end of logfile echo 'echo "=========="; tail -100 logfile' >> $(RTSH) echo 'tar czf tests_results.tgz tests_results' >> $(RTSH) @@ -122,7 +122,7 @@ endif echo 'echo exit status: $${RETVAL}' >> $(RTSH) echo 'exit $${RETVAL}' >> $(RTSH) rm -f $(TESTPACKAGE) - (cd $(DIST)/../.. ; tar czhf dist/$(TESTPACKAGE) runtests.sh dist/$(OBJDIR_NAME) dist/public security/nss/tests security/nss/cmd/bltest/tests security/nss/cmd/shlibsign; echo "created "`pwd`"/dist/$(TESTPACKAGE)" ) + (cd $(DIST)/../.. ; tar czhf dist/$(TESTPACKAGE) runtests.sh dist/$(OBJDIR_NAME) dist/public nss/tests nss/cmd/bltest/tests nss/cmd/shlibsign; echo "created "`pwd`"/dist/$(TESTPACKAGE)" ) android_run_tests: ssh -p $(ANDROID_PORT) -o CheckHostIP=no $(ANDROID_ADDR) 'pwd; cd; pwd; cd nsstest; export PATH=$$HOME/bin:$$PATH ; $(TEST_SHELL) runtests.sh' diff --git a/tests/remote/manifest.mn b/tests/remote/manifest.mn index b4afdc206..049f1617c 100644 --- a/tests/remote/manifest.mn +++ b/tests/remote/manifest.mn @@ -2,5 +2,5 @@ # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -CORE_DEPTH = ../../.. -DEPTH = ../../.. +CORE_DEPTH = ../.. +DEPTH = ../.. |