From fff8c8deaaea1f7d846e59aef7252b76af40b2c9 Mon Sep 17 00:00:00 2001
From: Igor Ignatyev <iignatyev@openjdk.org>
Date: Fri, 2 Oct 2020 13:44:12 +0000
Subject: [PATCH] 8253882: remove PropertyResolvingWrapper

Reviewed-by: shade
---
 .../vmTestbase/PropertyResolvingWrapper.java  | 136 ------------------
 1 file changed, 136 deletions(-)
 delete mode 100644 test/hotspot/jtreg/vmTestbase/PropertyResolvingWrapper.java

diff --git a/test/hotspot/jtreg/vmTestbase/PropertyResolvingWrapper.java b/test/hotspot/jtreg/vmTestbase/PropertyResolvingWrapper.java
deleted file mode 100644
index 4a2a99f71a0ad..0000000000000
--- a/test/hotspot/jtreg/vmTestbase/PropertyResolvingWrapper.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-/**
- * Replaces all {@code ${<X>}} with value of corresponding property({@code X}),
- * resulting string is handled similarly to {@code @run main} in jtreg.
- * In other words, {@code main} of first token will be executed with the rest
- * tokens as arguments.
- *
- * If one of properties can't be resolved, {@link Error} will be thrown.
- */
-public class PropertyResolvingWrapper {
-    private static final Properties properties;
-    static {
-        Properties p = System.getProperties();
-        String name = p.getProperty("os.name");
-        String arch = p.getProperty("os.arch");
-        String family;
-        String simple_arch;
-
-        // copy from jtreg/src/share/classes/com/sun/javatest/regtest/config/OS.java
-        if (name.startsWith("AIX"))
-            family = "aix";
-        else if (name.startsWith("Linux"))
-            family = "linux";
-        else if (name.startsWith("Mac") || name.startsWith("Darwin"))
-            family = "mac";
-        else if (name.startsWith("OS400") || name.startsWith("OS/400") )
-            family = "os400";
-        else if (name.startsWith("Windows"))
-            family = "windows";
-        else
-            family = name.replaceFirst("^([^ ]+).*", "$1"); // use first word of name
-
-        if (arch.contains("64")
-                 && !arch.equals("ia64")
-                 && !arch.equals("ppc64")
-                 && !arch.equals("ppc64le")
-                 && !arch.equals("zArch_64")
-                 && !arch.equals("aarch64"))
-             simple_arch = "x64";
-        else if (arch.contains("86"))
-            simple_arch = "i586";
-        else if (arch.equals("ppc") || arch.equals("powerpc"))
-            simple_arch = "ppc";
-        else if (arch.equals("s390x") || arch.equals("zArch_64"))
-            simple_arch = "s390x";
-        else
-            simple_arch = arch;
-
-        p.setProperty("os.family", family);
-        p.setProperty("os.simpleArch", simple_arch);
-        properties = p;
-    }
-
-    public static void main(String[] args) throws Throwable {
-        List<String> command = new ArrayList<>(args.length);
-        for (int i = 0; i < args.length; ++i) {
-            StringBuilder arg = new StringBuilder(args[i]);
-            while (i < args.length - 1
-                    && (arg.chars()
-                       .filter(c -> c == '"')
-                       .count() % 2) != 0) {
-                arg.append(" ")
-                   .append(args[++i]);
-            }
-            command.add(eval(arg.toString()));
-        }
-        System.out.println("run " + command);
-        try {
-            Class.forName(command.remove(0))
-                 .getMethod("main", String[].class)
-                 .invoke(null, new Object[]{command.toArray(new String[0])});
-        } catch (InvocationTargetException e) {
-           Throwable t = e.getCause();
-           t = t != null ? t : e;
-           throw t;
-        }
-    }
-
-    private static String eval(String string) {
-        int index;
-        int current = 0;
-        StringBuilder result = new StringBuilder();
-        while (current < string.length() && (index = string.indexOf("${", current)) >= 0) {
-            result.append(string.substring(current, index));
-            int endName = string.indexOf('}', index);
-            current = endName + 1;
-            String name = string.substring(index + 2, endName);
-            String value = properties.getProperty(name);
-            if (value == null) {
-                throw new Error("can't find property " + name);
-            }
-            result.append(value);
-        }
-        if (current < string.length()) {
-            result.append(string.substring(current));
-        }
-        int length = result.length();
-
-        if (length > 1 && result.charAt(0) == '"' && result.charAt(length - 1) == '"') {
-            result.deleteCharAt(length - 1);
-            result.deleteCharAt(0);
-        }
-        return result.toString();
-    }
-}