Skip to content

Commit

Permalink
Bug 1317318 - Run tests by getting the $objdir from dist/latest or ge…
Browse files Browse the repository at this point in the history
…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 1a6eb76
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 12 deletions.
5 changes: 4 additions & 1 deletion Makefile
Expand Up @@ -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

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

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

2 changes: 1 addition & 1 deletion automation/taskcluster/scripts/run_tests.sh
Expand Up @@ -14,4 +14,4 @@ fi
fetch_dist

# Run tests.
cd nss/tests && ./run.sh
cd nss/tests && ./all.sh
6 changes: 5 additions & 1 deletion tests/common/init.sh
Expand Up @@ -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)`
Expand Down
9 changes: 0 additions & 9 deletions tests/run.sh

This file was deleted.

0 comments on commit 1a6eb76

Please sign in to comment.