Bug 845556, follow up patch to adjust the Android testing for the new directory layout, r=bustage
authorKai Engert <kaie@kuix.de>
Sun, 03 Mar 2013 19:38:18 +0100
changeset 10689 4c6119e34aa0418c42a759761b0ce933a923ff6c
parent 10688 566aa414fe0cc8e6a21ccc3e05976850fdb2b11e
child 10690 2324bfa8dc3cabca49e0d22c9bbef66fba92309e
push id4
push userkaie@kuix.de
push dateSun, 03 Mar 2013 18:38:48 +0000
reviewersbustage
bugs845556
Bug 845556, follow up patch to adjust the Android testing for the new directory layout, r=bustage
tests/remote/Makefile
tests/remote/manifest.mn
--- a/tests/remote/Makefile
+++ b/tests/remote/Makefile
@@ -90,44 +90,44 @@ ifeq ($(OS_TARGET),Android)
 endif
 ifeq ($(CROSS_COMPILE),1)
 # execute signing on test system
 	echo 'export DIST=$${HOME}/nsstest/dist/'           >> $(RTSH)
 	echo 'export NSPR_LIB_DIR=$${DIST}/$${OBJDIR}/lib/' >> $(RTSH)
 	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)
 ifneq ($(OS_TARGET),Android)
 # Android's ash doesn't support "export -n" yet
 	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)
 	echo 'echo "created tests_results.tgz"'                                     >> $(RTSH)
 	echo 'echo "results are in directory: "`ls -1d tests_results/security/*.1`' >> $(RTSH)
 	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'
 
 android_install:
 	rm -f $(DIST)/android.sftp
 	echo '-mkdir nsstest' > $(DIST)/android.sftp
 	echo '-rm nsstest/$(TESTPACKAGE)' >> $(DIST)/android.sftp
--- a/tests/remote/manifest.mn
+++ b/tests/remote/manifest.mn
@@ -1,6 +1,6 @@
 # 
 # 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      = ../..