aboutsummaryrefslogtreecommitdiffstats
path: root/android
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2018-09-10 16:02:28 -0700
committerChristopher Ferris <cferris@google.com>2018-09-14 12:14:54 -0700
commit03b5d1c549d393f0a4c86cde7377e098ebb0e686 (patch)
tree025d300d4ff64f7929d19c3808f8655b577caa7b /android
parent7eecc47efac8cef90e806aca2758ef0fca63cf7a (diff)
downloadplatform_external_jemalloc_new-03b5d1c549d393f0a4c86cde7377e098ebb0e686.tar.gz
platform_external_jemalloc_new-03b5d1c549d393f0a4c86cde7377e098ebb0e686.tar.bz2
platform_external_jemalloc_new-03b5d1c549d393f0a4c86cde7377e098ebb0e686.zip
Add android extensions.master-cuttlefish-testing-release
Bug: 62621531 Bug: 110158834 Test: Ran unit tests and benchmarks using libc. Change-Id: Ie13ab8510c42f96b58496b0ab7e4f8c3a9cd2c6d
Diffstat (limited to 'android')
-rwxr-xr-xandroid/run_jemalloc_tests.sh13
1 files changed, 11 insertions, 2 deletions
diff --git a/android/run_jemalloc_tests.sh b/android/run_jemalloc_tests.sh
index ce1d7885..de085afc 100755
--- a/android/run_jemalloc_tests.sh
+++ b/android/run_jemalloc_tests.sh
@@ -1,4 +1,4 @@
-#!/system/bin/sh
+#!/bin/sh
#
# Copyright (C) 2014 The Android Open Source Project
#
@@ -94,7 +94,7 @@ STRESS_TESTS=( \
"microbench" \
)
-TEST_DIRECTORIES=( "/data/nativetest" "/data/nativetest64" )
+TEST_DIRECTORIES=( "nativetest" "nativetest64" )
FAILING_TESTS=()
function run_tests () {
@@ -120,8 +120,17 @@ function run_tests () {
fi
}
+if [[ "" == "$1" ]]; then
+ directory="/data"
+else
+ directory=$1;
+fi
+
+echo "Looking in $directory";
+
EXIT_CODE=0
for test_dir in ${TEST_DIRECTORIES[@]}; do
+ test_dir="${directory}/${test_dir}"
if [[ -d "${test_dir}" ]]; then
run_tests "unit" "${test_dir}/${UNIT_TEST_DIR}" ${UNIT_TESTS[@]}
run_tests "integration" "${test_dir}/${INTEGRATION_TEST_DIR}" ${INTEGRATION_TESTS[@]}