Skip to content
Permalink
Browse files
Bug 1317318 - Run tests by getting the $objdir from dist/latest or ge…
…nerate if missing r=mt

Differential Revision: https://nss-review.dev.mozaws.net/D62
  • Loading branch information
Tim Taubert committed Nov 15, 2016
1 parent 251b771 commit 1a6eb76d2bcdb14ba8c630bc6de7fa6a4a431cda
Showing with 10 additions and 12 deletions.
  1. +4 −1 Makefile
  2. +1 −1 automation/taskcluster/scripts/run_tests.sh
  3. +5 −1 tests/common/init.sh
  4. +0 −9 tests/run.sh
@@ -46,7 +46,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
# (7) Execute "local" rules. (OPTIONAL). #
#######################################################################

nss_build_all: build_nspr all
nss_build_all: build_nspr all latest

nss_clean_all: clobber_nspr clobber

@@ -163,3 +163,6 @@ nss_RelEng_bld: import all
package:
$(MAKE) -C pkg publish

latest:
echo $(OBJDIR_NAME) > $(CORE_DEPTH)/../dist/latest

@@ -14,4 +14,4 @@ fi
fetch_dist

# Run tests.
cd nss/tests && ./run.sh
cd nss/tests && ./all.sh
@@ -282,7 +282,11 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then
fi

if [ "${OBJDIR}" = "" ]; then
OBJDIR=`(cd $COMMON; $MAKE objdir_name)`
if [ -f ${DIST}/latest ]; then
OBJDIR=$(cat ${DIST}/latest)
else
OBJDIR=`($MAKE -s -C $COMMON objdir_name)`
fi
fi
if [ "${OS_ARCH}" = "" ]; then
OS_ARCH=`(cd $COMMON; $MAKE os_arch)`

This file was deleted.

0 comments on commit 1a6eb76

Please sign in to comment.