summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFranziskus Kiefer <franziskuskiefer@gmail.com>2018-04-11 11:04:09 +0200
committerFranziskus Kiefer <franziskuskiefer@gmail.com>2018-04-11 11:04:09 +0200
commit042bd9a7432826450ce4ed418f6795b2d7cbd362 (patch)
tree515e380afec83a56eca8ad24a9077a10713f7887
parent49b64312e2c7a54d8fc2fa1fc1bbbc48ccd1f28f (diff)
downloadnss-hg-042bd9a7432826450ce4ed418f6795b2d7cbd362.tar.gz
Bug 1437882 - mach bogo, r=ttaubert
Differential Revision: https://phabricator.services.mozilla.com/D905
-rwxr-xr-xmach2
-rwxr-xr-xtests/bogo/bogo.sh7
2 files changed, 5 insertions, 4 deletions
diff --git a/mach b/mach
index e4e1497e6..09a8189ca 100755
--- a/mach
+++ b/mach
@@ -194,7 +194,7 @@ def parse_arguments():
tests = [
"cipher", "lowhash", "chains", "cert", "dbtests", "tools", "fips",
"sdr", "crmf", "smime", "ssl", "ocsp", "merge", "pkits", "ec",
- "gtests", "ssl_gtests"
+ "gtests", "ssl_gtests", "bogo"
]
parser_test.add_argument(
'test', choices=tests, help="Available tests", action=testAction)
diff --git a/tests/bogo/bogo.sh b/tests/bogo/bogo.sh
index d108ef304..4fccb845b 100755
--- a/tests/bogo/bogo.sh
+++ b/tests/bogo/bogo.sh
@@ -39,11 +39,12 @@ bogo_cleanup()
. common/cleanup.sh
}
-cd "$(dirname "$0")"
-SOURCE_DIR="$PWD"/../..
+cd ../
+cwd=$(cd $(dirname $0); pwd -P)
+SOURCE_DIR="$cwd"/..
bogo_init
(cd "$BORING"/ssl/test/runner;
- GOPATH="$PWD" go test -pipe -shim-path "${BINDIR}"/nss_bogo_shim \
+ GOPATH="$cwd" go test -pipe -shim-path "${BINDIR}"/nss_bogo_shim \
-loose-errors -allow-unimplemented \
-shim-config "${SOURCE_DIR}/gtests/nss_bogo_shim/config.json") \
2>bogo.errors | tee bogo.log