test/tools/launcher/RunpathTest.java

*** 1,7 ****
  /*
!  * Copyright (c) 2012, 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.
--- 1,7 ----
  /*
!  * Copyright (c) 2012, 2013, 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.
*** 62,81 ****
          }
          System.out.println(javacmd + " contains expected RPATHS");
      }
  
      void testRpath() {
-         if (isDualMode && is64Bit) {
-             String expectedRpath = ".*RPATH.*\\$ORIGIN/../../lib/" + getJreArch()
-                     + ":\\$ORIGIN/../../jre/lib/" + getJreArch() + ".*";
-             elfCheck(java64Cmd, expectedRpath);
-         } else {
              String expectedRpath = ".*RPATH.*\\$ORIGIN/../lib/" + getJreArch()
                      + ":\\$ORIGIN/../jre/lib/" + getJreArch() + ".*";
              elfCheck(javaCmd, expectedRpath);
          }
-     }
  
      public static void main(String... args) throws Exception {
          if (isSolaris || isLinux) {
              RunpathTest rp = new RunpathTest();
              rp.testRpath();
--- 62,75 ----