Revert "Update ART run-tests for new Jack optimizations"
This reverts commit 8960b0ba78a70948810f0e178f51b0a6d201985d.
Bug: 34066768
Test: make -j32 test-art-host
Change-Id: Ifeb22d1e909d31ac6dd31bc0a66bab41ccb53425
diff --git a/test/442-checker-constant-folding/build b/test/442-checker-constant-folding/build
deleted file mode 100644
index 1d86fa5..0000000
--- a/test/442-checker-constant-folding/build
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-./default-build "$@" --jack-option "-D jack.optimization.use-def-cst-simplifier=false"
diff --git a/test/etc/default-build b/test/etc/default-build
index e646aba..e9e3886 100755
--- a/test/etc/default-build
+++ b/test/etc/default-build
@@ -63,7 +63,6 @@
DX_FLAGS=""
SKIP_DX_MERGER="false"
EXPERIMENTAL=""
-JACK_ARGS=""
# The key for default arguments if no experimental things are enabled.
DEFAULT_EXPERIMENT="no-experiment"
@@ -119,10 +118,6 @@
DEFAULT_EXPERIMENT=""
EXPERIMENTAL="${EXPERIMENTAL} $1"
shift
- elif [ "x$1" = "x--jack-option" ]; then
- shift
- JACK_ARGS="${JACK_ARGS} $1"
- shift
elif expr "x$1" : "x--" >/dev/null 2>&1; then
echo "unknown $0 option: $1" 1>&2
exit 1