diff options
| author | Alexandre Rames <alexandre.rames@linaro.org> | 2015-08-27 11:32:00 +0100 |
|---|---|---|
| committer | Alexandre Rames <alexandre.rames@linaro.org> | 2015-09-15 08:47:47 +0000 |
| commit | f941d0c1775b934ae852c3024ff5f5de84247d18 (patch) | |
| tree | 91a183d5c3c25134e5b9d9e337758c9d22172565 | |
| parent | 8e369c1cbda0e4633822d53a272d52459921ce5f (diff) | |
Remove the filter option from the build script.
The benchmarks to run can be filtered with the `run.py` script or via the java
app itself. This allows to simplify the build system.
One can stil build an app without specific benchmarks by simply deleting the
benchmark files.
Change-Id: Ie81bcd795796baf4e7920faf9c46b67cf0fc6887
| -rwxr-xr-x | benchmarking/java-ubenchs/build.sh | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/benchmarking/java-ubenchs/build.sh b/benchmarking/java-ubenchs/build.sh index 829488e..783a035 100755 --- a/benchmarking/java-ubenchs/build.sh +++ b/benchmarking/java-ubenchs/build.sh @@ -70,7 +70,7 @@ verbose_safe() { # Arguments handling -usage="Usage: $(basename "$0") [FILTER...] +usage="Usage: $(basename "$0") Build Java benchmark class, APK, and jar files. Output files are produced in $DIR_BUILD. @@ -112,18 +112,9 @@ RDIR_FRAMEWORK=$RDIR_BENCHMARKS/org/linaro/bench JAVA_BENCHMARK_FILES= FIND_BENCHMARKS_COMMAND="find $RDIR_BENCHMARKS ! -path $RDIR_FRAMEWORK/* -type f" +# Disable wildcard expansion. set -f -if [ $# -eq 0 ]; then - # No filters have been provided, so compile all benchmarks. - JAVA_BENCHMARK_FILES+="$($FIND_BENCHMARKS_COMMAND -name '*'.java) " -else - # Find benchmarks matching the provided filters. - FILTERS=("$@") - # Disable globbing for the `find` commands. - for filter in "${FILTERS[@]}"; do - JAVA_BENCHMARK_FILES+="$($FIND_BENCHMARKS_COMMAND -name $filter) " - done -fi +JAVA_BENCHMARK_FILES+="$($FIND_BENCHMARKS_COMMAND -name '*'.java) " set +f # Transform the list of java files in a list of strings that will be provided to |