*** old/test/compiler/aot/cli/NonExistingAOTLibraryTest.java	Wed Feb  8 13:38:25 2017
--- new/test/compiler/aot/cli/NonExistingAOTLibraryTest.java	Wed Feb  8 13:38:24 2017

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 2016, 2017, 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.

*** 23,33 ****
--- 23,33 ----
  
  /*
   * @test
   * @library /test/lib /testlibrary /
   * @modules java.base/jdk.internal.misc
!  * @requires vm.bits == "64" & os.arch == "amd64" & os.family == "linux"
!  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
   * @run driver compiler.aot.cli.NonExistingAOTLibraryTest
   * @summary check if non-existing aot library is handled properly
   */
  
  package compiler.aot.cli;

*** 36,46 ****
--- 36,46 ----
  
  public class NonExistingAOTLibraryTest {
      private static final String PATH = "./NonExisting.so";
      private static final String OPTION = "-XX:AOTLibrary=" + PATH;
      private static final String[] EXPECTED_MESSAGES = new String[] {
!         "cannot open shared object file"
!         "error opening file"
      };
  
      public static void main(String args[]) {
          if (new File(PATH).exists()) {
              throw new Error("TESTBUG: " + PATH + " unexpectedly exists");