rev 4502 : 7115383: TEST_BUG: some jtreg tests fail because they explicitly specify -server option
Summary: Small changes to hotspot tests to remove  "-server" and replace with ${TESTVMOPTS}
Reviewed-by: kvn

          --- old/test/compiler/6636138/Test1.java
          +++ new/test/compiler/6636138/Test1.java

   1    1  /*
   2    2   * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
   3    3   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   4    4   *
   5    5   * This code is free software; you can redistribute it and/or modify it
   6    6   * under the terms of the GNU General Public License version 2 only, as
   7    7   * published by the Free Software Foundation.
   8    8   *
   9    9   * This code is distributed in the hope that it will be useful, but WITHOUT
  10   10   * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  11   11   * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  12   12   * version 2 for more details (a copy is included in the LICENSE file that
  13   13   * accompanied this code).
  14   14   *
  15   15   * You should have received a copy of the GNU General Public License version
  16   16   * 2 along with this work; if not, write to the Free Software Foundation,
  17   17   * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  18   18   *

  19   19   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  20   20   * or visit www.oracle.com if you need additional information or have any
  21   21   * questions.
  22   22   */
  23   23  
  24   24  /**
  25   25   * @test
  26   26   * @bug 6636138
  27   27   * @summary SuperWord::co_locate_pack(Node_List* p) generates memory graph that leads to memory order violation.
  28   28   *
  29      - * @run main/othervm -server -Xbatch -XX:CompileOnly=Test1.init Test1
       29 + * @run main/othervm -Xbatch -XX:CompileOnly=Test1.init Test1
  30   30   */
  31   31  
  32   32  public class Test1 {
  33   33  
  34   34      public static void init(int src[], int [] dst, int[] ref) {
  35   35          // initialize the arrays
  36   36          for (int i =0; i<src.length; i++) {
  37   37              src[i] =  i;
  38   38              dst[i] = 2;      // yes, dst[i] needed(otherwise src[i] will be replaced with i)
  39   39              ref[i] = src[i]; // src[i] depends on the store src[i]

  40   40          }
  41   41      }
  42   42  
  43   43      public static void verify(int src[], int[] ref) {
  44   44          // check whether src and ref are equal
  45   45          for (int i = 0; i < src.length; i++) {
  46   46              if (src[i] != ref[i]) {
  47   47                  System.out.println("Error: src and ref don't match at " + i);
  48   48                  System.exit(97);
  49   49              }
  50   50          }
  51   51      }
  52   52  
  53   53      public static void test() {
  54   54          int[] src = new int[34];
  55   55          int[] dst = new int[34];
  56   56          int[] ref = new int[34];
  57   57  
  58   58          init(src, dst, ref);
  59   59          verify(src, ref);
  60   60      }
  61   61  
  62   62      public static void main(String[] args) {
  63   63          for (int i=0; i< 2000; i++) {
  64   64              test();
  65   65          }
  66   66      }
  67   67  }

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX