diff --git a/src/solaris/native/java/net/NetworkInterface.c b/src/solaris/native/java/net/NetworkInterface.c
index 0f987ff..e4f8965 100644
--- a/src/solaris/native/java/net/NetworkInterface.c
+++ b/src/solaris/native/java/net/NetworkInterface.c
@@ -139,8 +139,12 @@
 #ifdef __solaris__
 static netif *enumIPvXInterfaces(JNIEnv *env, int sock, netif *ifs, int family);
 static int    getMacFromDevice(JNIEnv *env, const char* ifname, unsigned char* retbuf);
+
+#ifndef SIOCGLIFHWADDR
+#define SIOCGLIFHWADDR  _IOWR('i', 192, struct lifreq)
 #endif
 
+#endif
 
 /******************* Java entry points *****************************/
 
@@ -1567,6 +1571,20 @@
     struct sockaddr_in* sin;
     struct sockaddr_in ipAddr;
     int len, i;
+    struct lifreq lif;
+
+    /* First, try the new (S11) SIOCGLIFHWADDR ioctl(). If that fails
+     * try the old way.
+     */
+    memset(&lif, 0, sizeof(lif));
+    strlcpy(lif.lifr_name, ifname, sizeof(lif.lifr_name));
+
+    if (ioctl(sock, SIOCGLIFHWADDR, &lif) != -1) {
+        struct sockaddr_dl *sp;
+        sp = (struct sockaddr_dl *)&lif.lifr_addr;
+        memcpy(buf, &sp->sdl_data[0], sp->sdl_alen);
+        return sp->sdl_alen;
+    }
 
    /**
     * On Solaris we have to use DLPI, but it will only work if we have
@@ -1576,34 +1594,29 @@
     if ((len = getMacFromDevice(env, ifname, buf))  == 0) {
         /*DLPI failed - trying to do arp lookup*/
 
-       if (addr == NULL) {
-          /**
-           * No IPv4 address for that interface, so can't do an ARP lookup.
-           */
-           return -1;
-      }
+        if (addr == NULL) {
+            /**
+             * No IPv4 address for that interface, so can't do an ARP lookup.
+             */
+             return -1;
+         }
 
-      len = 6; //???
+         len = 6; //???
 
-      sin = (struct sockaddr_in *) &arpreq.arp_pa;
-      memset((char *) &arpreq, 0, sizeof(struct arpreq));
-      ipAddr.sin_port = 0;
-      ipAddr.sin_family = AF_INET;
-      memcpy(&ipAddr.sin_addr, addr, sizeof(struct in_addr));
-      memcpy(&arpreq.arp_pa, &ipAddr, sizeof(struct sockaddr_in));
-      arpreq.arp_flags= ATF_PUBL;
+         sin = (struct sockaddr_in *) &arpreq.arp_pa;
+         memset((char *) &arpreq, 0, sizeof(struct arpreq));
+         ipAddr.sin_port = 0;
+         ipAddr.sin_family = AF_INET;
+         memcpy(&ipAddr.sin_addr, addr, sizeof(struct in_addr));
+         memcpy(&arpreq.arp_pa, &ipAddr, sizeof(struct sockaddr_in));
+         arpreq.arp_flags= ATF_PUBL;
 
-      if (ioctl(sock, SIOCGARP, &arpreq) < 0) {
-          if (errno != ENXIO) {
-              // "No such device or address" means no hardware address, so it's
-              // normal don't throw an exception
-              NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", "IOCTL failed");
-              return -1;
-          }
-     }
+         if (ioctl(sock, SIOCGARP, &arpreq) < 0) {
+             return -1;
+         }
 
-     memcpy(buf, &arpreq.arp_ha.sa_data[0], len );
-  }
+         memcpy(buf, &arpreq.arp_ha.sa_data[0], len );
+    }
 
     /*
      * All bytes to 0 means no hardware address.
diff --git a/test/ProblemList.txt b/test/ProblemList.txt
index 457be2c..c2fd9fc 100644
--- a/test/ProblemList.txt
+++ b/test/ProblemList.txt
@@ -43,11 +43,11 @@
 #
 # List items  are testnames followed by labels, all MUST BE commented
 #   as to why they are here and use a label:
-#     generic-all	Problems on all platforms
-#     generic-ARCH	Where ARCH is one of: sparc, sparcv9, x64, i586, etc.
-#     OSNAME-all	Where OSNAME is one of: solaris, linux, windows
-#     OSNAME-ARCH	Specific on to one OSNAME and ARCH, e.g. solaris-x64
-#     OSNAME-REV	Specific on to one OSNAME and REV, e.g. solaris-5.8
+#     generic-all       Problems on all platforms
+#     generic-ARCH      Where ARCH is one of: sparc, sparcv9, x64, i586, etc.
+#     OSNAME-all        Where OSNAME is one of: solaris, linux, windows
+#     OSNAME-ARCH       Specific on to one OSNAME and ARCH, e.g. solaris-x64
+#     OSNAME-REV        Specific on to one OSNAME and REV, e.g. solaris-5.8
 #
 # More than one label is allowed but must be on the same line.
 #
@@ -123,38 +123,38 @@
 java/awt/event/MouseEvent/AcceptExtraButton/AcceptExtraButton.java generic-all
 
 # Causes hang in samevm mode??? Solaris 11 i586
-java/awt/FullScreen/SetFSWindow/FSFrame.java			generic-all
+java/awt/FullScreen/SetFSWindow/FSFrame.java                    generic-all
 
 # Fails on solaris 11 i586, -client, in othervm mode not sure why
-java/awt/Component/PrintAllXcheckJNI/PrintAllXcheckJNI.java	generic-all
+java/awt/Component/PrintAllXcheckJNI/PrintAllXcheckJNI.java     generic-all
 java/awt/Focus/CloseDialogActivateOwnerTest/CloseDialogActivateOwnerTest.java generic-all
-java/awt/FontClass/FontAccess.java				generic-all
-java/awt/Mixing/HWDisappear.java				generic-all
-java/awt/Mixing/MixingInHwPanel.java				generic-all
-java/awt/Mouse/MaximizedFrameTest/MaximizedFrameTest.html	generic-all
+java/awt/FontClass/FontAccess.java                              generic-all
+java/awt/Mixing/HWDisappear.java                                generic-all
+java/awt/Mixing/MixingInHwPanel.java                            generic-all
+java/awt/Mouse/MaximizedFrameTest/MaximizedFrameTest.html       generic-all
 java/awt/Robot/AcceptExtraMouseButtons/AcceptExtraMouseButtons.java generic-all
-java/awt/Toolkit/SecurityTest/SecurityTest2.java		generic-all
-java/awt/image/mlib/MlibOpsTest.java				generic-all
+java/awt/Toolkit/SecurityTest/SecurityTest2.java                generic-all
+java/awt/image/mlib/MlibOpsTest.java                            generic-all
 
 # Fails on windows, othervm mode, various errors
-java/awt/Focus/NonFocusableWindowTest/NonfocusableOwnerTest.java	generic-all
-java/awt/Focus/OwnedWindowFocusIMECrashTest/OwnedWindowFocusIMECrashTest.java	generic-all
-java/awt/FullScreen/NoResizeEventOnDMChangeTest/NoResizeEventOnDMChangeTest.java	generic-all
-java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersUnitTest_Standard.java	generic-all
-java/awt/event/KeyEvent/KeyTyped/CtrlASCII.html			generic-all
-java/awt/font/Threads/FontThread.java				generic-all
-java/awt/print/PrinterJob/PrtException.java			generic-all
+java/awt/Focus/NonFocusableWindowTest/NonfocusableOwnerTest.java        generic-all
+java/awt/Focus/OwnedWindowFocusIMECrashTest/OwnedWindowFocusIMECrashTest.java   generic-all
+java/awt/FullScreen/NoResizeEventOnDMChangeTest/NoResizeEventOnDMChangeTest.java        generic-all
+java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersUnitTest_Standard.java      generic-all
+java/awt/event/KeyEvent/KeyTyped/CtrlASCII.html                 generic-all
+java/awt/font/Threads/FontThread.java                           generic-all
+java/awt/print/PrinterJob/PrtException.java                     generic-all
 
 # Fails with windows X64, othervm, -server
-com/sun/awt/Translucency/WindowOpacity.java			generic-all
-java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java		generic-all
-java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.html	generic-all
+com/sun/awt/Translucency/WindowOpacity.java                     generic-all
+java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java             generic-all
+java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.html generic-all
 java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest1.html generic-all
 java/awt/Focus/FocusEmbeddedFrameTest/FocusEmbeddedFrameTest.java generic-all
-java/awt/Frame/LayoutOnMaximizeTest/LayoutOnMaximizeTest.java	generic-all
-java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java	generic-all
-java/awt/Mixing/MixingOnShrinkingHWButton.java			generic-all
-java/awt/Mouse/MouseModifiersUnitTest/ExtraButtonDrag.java	generic-all
+java/awt/Frame/LayoutOnMaximizeTest/LayoutOnMaximizeTest.java   generic-all
+java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java    generic-all
+java/awt/Mixing/MixingOnShrinkingHWButton.java                  generic-all
+java/awt/Mouse/MouseModifiersUnitTest/ExtraButtonDrag.java      generic-all
 
 ############################################################################
 
@@ -166,30 +166,30 @@
 #  So a large batch of beans tests are currently run with othervm mode.
 
 # Filed 6986807
-java/beans/Introspector/TestTypeResolver.java   		generic-all
+java/beans/Introspector/TestTypeResolver.java                   generic-all
 
 # Filed 6986813
-java/beans/Introspector/memory/Test4508780.java			generic-all
+java/beans/Introspector/memory/Test4508780.java                 generic-all
 
 # Linux, some kind of problems with X11 display
-java/beans/PropertyChangeSupport/Test4682386.java		generic-all
-java/beans/PropertyChangeSupport/TestSynchronization.java	generic-all
-java/beans/Statement/Test4653179.java				generic-all
+java/beans/PropertyChangeSupport/Test4682386.java               generic-all
+java/beans/PropertyChangeSupport/TestSynchronization.java       generic-all
+java/beans/Statement/Test4653179.java                           generic-all
 
 # Runs REALLY slow on Solaris sparc for some reason, both -client and -server
-java/beans/XMLEncoder/Test4625418.java				solaris-sparc
+java/beans/XMLEncoder/Test4625418.java                          solaris-sparc
 
 # Problems with samevm and setting security manager (speculation partially)
-java/beans/Introspector/4168475/Test4168475.java		generic-all
-java/beans/Introspector/4520754/Test4520754.java		generic-all
-java/beans/Introspector/6380849/TestBeanInfo.java		generic-all
-java/beans/Introspector/Test4144543.java			generic-all
+java/beans/Introspector/4168475/Test4168475.java                generic-all
+java/beans/Introspector/4520754/Test4520754.java                generic-all
+java/beans/Introspector/6380849/TestBeanInfo.java               generic-all
+java/beans/Introspector/Test4144543.java                        generic-all
 
 # Failed to call method solaris-sparc???
-java/beans/EventHandler/Test6788531.java		 	generic-all
+java/beans/EventHandler/Test6788531.java                        generic-all
 
 # Jar or class not found???
-java/beans/XMLEncoder/6329581/Test6329581.java		 	generic-all
+java/beans/XMLEncoder/6329581/Test6329581.java                  generic-all
 
 ############################################################################
 
@@ -199,26 +199,26 @@
 java/lang/invoke/InvokeDynamicPrintArgs.java                    generic-all
 
 # 7079093
-java/lang/instrument/ManifestTest.sh				windows-all
+java/lang/instrument/ManifestTest.sh                            windows-all
 
 ############################################################################
 
 # jdk_management
 
 # 6944188
-java/lang/management/ThreadMXBean/ThreadStateTest.java		generic-all
+java/lang/management/ThreadMXBean/ThreadStateTest.java          generic-all
 
 # 7067973
 java/lang/management/MemoryMXBean/CollectionUsageThreshold.java generic-all
 
 # Failing, bug was filed: 6959636
-javax/management/loading/LibraryLoader/LibraryLoaderTest.java	generic-all
+javax/management/loading/LibraryLoader/LibraryLoaderTest.java   generic-all
 
 # Access denied messages on windows/mks, filed 6954450
-sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.sh	windows-all
+sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.sh      windows-all
 
 # Fails on linux: KO: StringMonitor notification missed or not emitted
-javax/management/monitor/NonComparableAttributeValueTest.java	generic-all
+javax/management/monitor/NonComparableAttributeValueTest.java   generic-all
 
 # Port conflict? Fails with communication error
 sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh generic-all
@@ -229,10 +229,10 @@
 javax/management/remote/mandatory/connection/ReconnectTest.java generic-all
 
 # Solaris 10 sparc, NPE from org.omg.stub.javax.management.remote.rmi._RMIConnectionImpl_Tie._invoke
-javax/management/remote/mandatory/threads/ExecutorTest.java 	generic-all
+javax/management/remote/mandatory/threads/ExecutorTest.java     generic-all
 
 # Linux 32bit Fedora 9, IllegalStateException
-javax/management/monitor/RuntimeExceptionTest.java		generic-all
+javax/management/monitor/RuntimeExceptionTest.java              generic-all
 
 # Problems with rmi connection, othervm
 javax/management/remote/mandatory/subjectDelegation/SubjectDelegation2Test.java generic-all
@@ -241,16 +241,16 @@
 sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh generic-all
 
 # Fails with port already in use
-sun/management/jmxremote/bootstrap/RmiRegistrySslTest.sh	generic-all
+sun/management/jmxremote/bootstrap/RmiRegistrySslTest.sh        generic-all
 
 # Windows, connection can't last that long
-javax/management/eventService/LeaseTest.java			generic-all
+javax/management/eventService/LeaseTest.java                    generic-all
 
 # Linux othervm, X64, java.lang.Exception: Failed: ratio=102.4027795593753
-javax/management/remote/mandatory/notif/ListenerScaleTest.java	generic-all
+javax/management/remote/mandatory/notif/ListenerScaleTest.java  generic-all
 
 # Windows run seems to have triggered a hotspot gc error (see 6801625)
-com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh		generic-all
+com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh          generic-all
 
 # rmi problem? othervm, java.lang.reflect.UndeclaredThrowableException
 javax/management/remote/mandatory/subjectDelegation/SubjectDelegation3Test.java generic-all
@@ -259,30 +259,30 @@
 javax/management/remote/mandatory/notif/NotificationBufferDeadlockTest.java generic-all
 
 # Times out on solaris sparc, with othervm
-javax/management/eventService/AddRemoveListenerTest.java	generic-all
+javax/management/eventService/AddRemoveListenerTest.java        generic-all
 
 # Linux i586 and x64 -server, timed out waiting for threads to expire? othervm
-javax/management/eventService/EventClientThreadTest.java	generic-all
+javax/management/eventService/EventClientThreadTest.java        generic-all
 
 # Linux i586 -server, Expected to receive 20, but got 21, othervm
 #   Fails on Linux X64 -server 20!=21
-javax/management/eventService/FetchingTest.java			generic-all
+javax/management/eventService/FetchingTest.java                 generic-all
 
 # NPE on windows 2000 i586 -client and -server
-javax/management/eventService/CustomForwarderTest.java	 	windows-all
+javax/management/eventService/CustomForwarderTest.java          windows-all
 
 # Windows i586 failure, callback did not complete
-javax/management/eventService/LeaseManagerDeadlockTest.java 	windows-all
+javax/management/eventService/LeaseManagerDeadlockTest.java     windows-all
 
 # Port already in use
-sun/management/jmxremote/bootstrap/LocalManagementTest.sh 	generic-all
+sun/management/jmxremote/bootstrap/LocalManagementTest.sh       generic-all
 
 # Failed to initialize connector (also overflowing jtreg io buffers)
-sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh	 	generic-all
-sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh 	generic-all
+sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh          generic-all
+sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh       generic-all
 
 # Windows X64, java.lang.IllegalStateException
-javax/management/monitor/AttributeArbitraryDataTypeTest.java	generic-all
+javax/management/monitor/AttributeArbitraryDataTypeTest.java    generic-all
 
 ############################################################################
 
@@ -293,92 +293,89 @@
 # jdk_misc
 
 # Need to be marked othervm, or changed to be samevm safe
-com/sun/jndi/rmi/registry/RegistryContext/UnbindIdempotent.java	generic-all
+com/sun/jndi/rmi/registry/RegistryContext/UnbindIdempotent.java generic-all
 
 # Need to be marked othervm, or changed to be samevm safe
 com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java generic-all
 
 # Solaris sparc and others, exception in initializer
-javax/imageio/CachePremissionsTest/CachePermissionsTest.java 	generic-all
+javax/imageio/CachePremissionsTest/CachePermissionsTest.java    generic-all
 
 # Leaves file rgba_* open, fails with windows samevm
-javax/imageio/plugins/png/PngOutputTypeTest.java		generic-all
+javax/imageio/plugins/png/PngOutputTypeTest.java                generic-all
 
 # Suspect test.png file is left open, windows samevm problems
-javax/imageio/plugins/png/ITXtTest.java				generic-all
+javax/imageio/plugins/png/ITXtTest.java                         generic-all
 
 # Solaris sparc and others, failed to compile testcase
-javax/imageio/metadata/DOML3Node.java			 	generic-all
+javax/imageio/metadata/DOML3Node.java                           generic-all
 
 # One of these tests is leaving file IMGP1001.JPG open, windows samevm
-javax/imageio/plugins/jpeg/ConcurrentReadingTest.java		generic-all
-javax/imageio/plugins/jpeg/ReadingInterruptionTest.java		generic-all
+javax/imageio/plugins/jpeg/ConcurrentReadingTest.java           generic-all
+javax/imageio/plugins/jpeg/ReadingInterruptionTest.java         generic-all
 
 # One of these files is missing a close on writer_* files, windows samevm
-javax/imageio/plugins/jpeg/ConcurrentWritingTest.java		generic-all
-javax/imageio/plugins/jpeg/WritingInterruptionTest.java		generic-all
+javax/imageio/plugins/jpeg/ConcurrentWritingTest.java           generic-all
+javax/imageio/plugins/jpeg/WritingInterruptionTest.java         generic-all
 
 # Leaving file test.jpg open, windows samevm
-javax/imageio/plugins/jpeg/ReadAsGrayTest.java			generic-all
+javax/imageio/plugins/jpeg/ReadAsGrayTest.java                  generic-all
 
 # Missing close on file wbmp*, windows samevm
-javax/imageio/plugins/wbmp/CanDecodeTest.java			generic-all
+javax/imageio/plugins/wbmp/CanDecodeTest.java                   generic-all
 
 # Failures on OpenSolaris, cannot read input files? samevm issues?
-javax/imageio/metadata/BooleanAttributes.java			generic-all
-javax/imageio/plugins/bmp/BMPSubsamplingTest.java		generic-all
-javax/imageio/plugins/bmp/TopDownTest.java			generic-all
-javax/imageio/plugins/gif/EncodeSubImageTest.java		generic-all
-javax/imageio/plugins/gif/GifTransparencyTest.java		generic-all
-javax/imageio/plugins/png/GrayPngTest.java			generic-all
-javax/imageio/plugins/png/ItxtUtf8Test.java			generic-all
-javax/imageio/plugins/png/MergeStdCommentTest.java		generic-all
-javax/imageio/plugins/png/ShortHistogramTest.java		generic-all
-javax/imageio/plugins/shared/BitDepth.java			generic-all
+javax/imageio/metadata/BooleanAttributes.java                   generic-all
+javax/imageio/plugins/bmp/BMPSubsamplingTest.java               generic-all
+javax/imageio/plugins/bmp/TopDownTest.java                      generic-all
+javax/imageio/plugins/gif/EncodeSubImageTest.java               generic-all
+javax/imageio/plugins/gif/GifTransparencyTest.java              generic-all
+javax/imageio/plugins/png/GrayPngTest.java                      generic-all
+javax/imageio/plugins/png/ItxtUtf8Test.java                     generic-all
+javax/imageio/plugins/png/MergeStdCommentTest.java              generic-all
+javax/imageio/plugins/png/ShortHistogramTest.java               generic-all
+javax/imageio/plugins/shared/BitDepth.java                      generic-all
 
 # Exclude all javax/print tests, even if they passed, they may need samevm work
 
 # Times out on solaris-sparc, sparcv9, x64 -server, some on i586 -client
-javax/print/attribute/autosense/PrintAutoSenseData.java 	generic-all
-javax/print/attribute/Chroma.java			 	generic-all
-javax/print/attribute/CollateAttr.java			 	generic-all
-javax/print/attribute/PSCopiesFlavorTest.java		 	generic-all
-javax/print/LookupServices.java 			 	generic-all
-javax/print/TestRaceCond.java				 	generic-all
+javax/print/attribute/autosense/PrintAutoSenseData.java         generic-all
+javax/print/attribute/Chroma.java                               generic-all
+javax/print/attribute/CollateAttr.java                          generic-all
+javax/print/attribute/PSCopiesFlavorTest.java                   generic-all
+javax/print/LookupServices.java                                 generic-all
+javax/print/TestRaceCond.java                                   generic-all
 
 # These tests really require a printer (might all be windows only tests?)
-javax/print/CheckDupFlavor.java					generic-all
-javax/print/PrintSE/PrintSE.sh					generic-all
-javax/print/attribute/ChromaticityValues.java			generic-all
-javax/print/attribute/GetCopiesSupported.java			generic-all
-javax/print/attribute/SidesPageRangesTest.java			generic-all
-javax/print/attribute/SupportedPrintableAreas.java		generic-all
+javax/print/CheckDupFlavor.java                                 generic-all
+javax/print/PrintSE/PrintSE.sh                                  generic-all
+javax/print/attribute/ChromaticityValues.java                   generic-all
+javax/print/attribute/GetCopiesSupported.java                   generic-all
+javax/print/attribute/SidesPageRangesTest.java                  generic-all
+javax/print/attribute/SupportedPrintableAreas.java              generic-all
 javax/print/attribute/AttributeTest.java                        generic-all
 
 # Only print test left, excluding just because all print tests have been
-javax/print/attribute/MediaMappingsTest.java 			generic-all
+javax/print/attribute/MediaMappingsTest.java                    generic-all
 
 # Filed 7058852
-javax/sound/sampled/FileWriter/AlawEncoderSync.java		generic-all
+javax/sound/sampled/FileWriter/AlawEncoderSync.java             generic-all
 
 ############################################################################
 
 # jdk_net
 
 # Filed 7052625
-com/sun/net/httpserver/bugs/6725892/Test.java			generic-all
+com/sun/net/httpserver/bugs/6725892/Test.java                   generic-all
 
 # Filed 7036666
-com/sun/net/httpserver/Test9a.java				generic-all
+com/sun/net/httpserver/Test9a.java                              generic-all
 
 # 7079145 java/net/ipv6tests/UdpTest.java hang at IPv6 only data exchange
 java/net/ipv6tests/UdpTest.java                                 linux-all
 
-# 7079012
-java/net/NetworkInterface/NetParamsTest.java			solaris-all
-
 # 7081476
-java/net/InetSocketAddress/B6469803.java			generic-all
+java/net/InetSocketAddress/B6469803.java                        generic-all
 
 ############################################################################
 
@@ -388,10 +385,10 @@
 java/io/File/MaxPathLength.java                                 windows-all
 
 # 6671616
-java/io/File/BlockIsDirectory.java				solaris-all
+java/io/File/BlockIsDirectory.java                              solaris-all
 
 # 7076644
-java/io/File/Basic.java						windows-all
+java/io/File/Basic.java                                         windows-all
 
 ############################################################################
 
@@ -401,14 +398,14 @@
 java/nio/channels/Selector/Wakeup.java                          windows-all
 
 # 7076700
-java/nio/channels/SocketChannel/AdaptSocket.java		generic-all
+java/nio/channels/SocketChannel/AdaptSocket.java                generic-all
 
 ############################################################################
 
 # jdk_rmi
 
 # Port already in use, fails on sparc, othervm
-java/rmi/reliability/benchmark/runRmiBench.sh			generic-all
+java/rmi/reliability/benchmark/runRmiBench.sh                   generic-all
 
 # Already in use port issues? othervm solaris
 java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java generic-all
@@ -418,21 +415,21 @@
 java/rmi/transport/dgcDeadLock/TestImpl_Stub.java                       generic-all
 
 # Address already in use, othervm mode, solaris
-java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod.java	generic-all
-java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java	generic-all
+java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod.java        generic-all
+java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java  generic-all
 
 # Registry already running on port, solaris
-java/rmi/Naming/legalRegistryNames/LegalRegistryNames.java	generic-all
+java/rmi/Naming/legalRegistryNames/LegalRegistryNames.java      generic-all
 
 # Fails on Linux 32 and 64bit -server?, impl not garbage collected???
-java/rmi/transport/pinLastArguments/PinLastArguments.java	generic-all
+java/rmi/transport/pinLastArguments/PinLastArguments.java       generic-all
 
 # Times out on solaris sparc
-java/rmi/server/RemoteServer/AddrInUse.java			generic-all
+java/rmi/server/RemoteServer/AddrInUse.java                     generic-all
 
 # Connection error on Windows i586 -server
 #  Also connection errors in othervm on Solaris 10 sparc, same port???
-sun/rmi/transport/tcp/DeadCachedConnection.java 	 	generic-all
+sun/rmi/transport/tcp/DeadCachedConnection.java                 generic-all
 
 # Connection errors in othervm on Solaris 10 sparc, same port???
 java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java generic-all
@@ -478,20 +475,20 @@
 # jdk_security
 
 # Failing on Solaris i586, 3/9/2010, not a -samevm issue (jdk_security3)
-sun/security/pkcs11/Secmod/AddPrivateKey.java			solaris-i586
-sun/security/pkcs11/ec/ReadCertificates.java			solaris-i586
-sun/security/pkcs11/ec/ReadPKCS12.java				solaris-i586
-sun/security/pkcs11/ec/TestCurves.java				solaris-i586
-sun/security/pkcs11/ec/TestECDSA.java				solaris-i586
-#sun/security/pkcs11/ec/TestECGenSpec.java			solaris-i586
-#sun/security/pkcs11/ec/TestKeyFactory.java			solaris-i586
-sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java		solaris-i586
+sun/security/pkcs11/Secmod/AddPrivateKey.java                   solaris-i586
+sun/security/pkcs11/ec/ReadCertificates.java                    solaris-i586
+sun/security/pkcs11/ec/ReadPKCS12.java                          solaris-i586
+sun/security/pkcs11/ec/TestCurves.java                          solaris-i586
+sun/security/pkcs11/ec/TestECDSA.java                           solaris-i586
+#sun/security/pkcs11/ec/TestECGenSpec.java                      solaris-i586
+#sun/security/pkcs11/ec/TestKeyFactory.java                     solaris-i586
+sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java            solaris-i586
 
 # Directly references PKCS11 class
 sun/security/pkcs11/Provider/Absolute.java                      windows-x64
 
 # Fails on Fedora 9/Ubuntu 10.04 64bit, PKCS11Exception: CKR_DEVICE_ERROR
-sun/security/pkcs11/KeyAgreement/TestDH.java			generic-all
+sun/security/pkcs11/KeyAgreement/TestDH.java                    generic-all
 
 # Run too slow on Solaris 10 sparc
 sun/security/ssl/com/sun/net/ssl/internal/ssl/InputRecord/SSLSocketTimeoutNulls.java solaris-sparc
@@ -508,14 +505,14 @@
 
 # Times out on windows X64, othervm mode
 #    Solaris sparc and sparcv9 -server, timeout
-sun/security/ssl/javax/net/ssl/NewAPIs/SessionTimeOutTests.java	generic-all
+sun/security/ssl/javax/net/ssl/NewAPIs/SessionTimeOutTests.java generic-all
 
 # Various failures on Linux Fedora 9 X64, othervm mode
 sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/TestAllSuites.java generic-all
-sun/security/ssl/sanity/ciphersuites/CheckCipherSuites.java	generic-all
+sun/security/ssl/sanity/ciphersuites/CheckCipherSuites.java     generic-all
 
 # Various failures on Linux Fedora 9 X64, othervm mode
-sun/security/ssl/sanity/interop/ClientJSSEServerJSSE.java	generic-all
+sun/security/ssl/sanity/interop/ClientJSSEServerJSSE.java       generic-all
 
 # 7079203 sun/security/tools/keytool/printssl.sh fails on solaris with timeout
 sun/security/tools/keytool/printssl.sh                          solaris-all
@@ -524,7 +521,7 @@
 sun/security/tools/jarsigner/ec.sh                             solaris-all
 
 # 7081817
-sun/security/provider/certpath/X509CertPath/IllegalCertiticates.java 	generic-all
+sun/security/provider/certpath/X509CertPath/IllegalCertiticates.java    generic-all
 
 # 7041639, Solaris DSA keypair generation bug (Note: jdk_util also affected)
 java/security/KeyPairGenerator/SolarisShortDSA.java             solaris-all
@@ -541,57 +538,57 @@
 # jdk_swing (not using samevm)
 
 # Fails on solaris 11 i586, with othervm
-javax/swing/JFileChooser/6570445/bug6570445.java		generic-all
-javax/swing/JFileChooser/6738668/bug6738668.java		generic-all
-javax/swing/JPopupMenu/6675802/bug6675802.java			generic-all
-javax/swing/system/6799345/TestShutdown.java			generic-all
+javax/swing/JFileChooser/6570445/bug6570445.java                generic-all
+javax/swing/JFileChooser/6738668/bug6738668.java                generic-all
+javax/swing/JPopupMenu/6675802/bug6675802.java                  generic-all
+javax/swing/system/6799345/TestShutdown.java                    generic-all
 
 ############################################################################
 
 # jdk_text
 
 # Linux x64 occasional errors, no details
-java/text/Bidi/Bug6665028.java				 	linux-x64
+java/text/Bidi/Bug6665028.java                                  linux-x64
 
 ############################################################################
 
 # jdk_tools
 
 # Filed 6952105
-com/sun/jdi/SuspendThreadTest.java				generic-all
+com/sun/jdi/SuspendThreadTest.java                              generic-all
 
 # Filed 6653793
-com/sun/jdi/RedefineCrossEvent.java				generic-all
+com/sun/jdi/RedefineCrossEvent.java                             generic-all
 
 # Filed 6987312
-com/sun/jdi/DoubleAgentTest.java				generic-all
+com/sun/jdi/DoubleAgentTest.java                                generic-all
 
 # Filed 7020857
-com/sun/jdi/FieldWatchpoints.java				generic-all
+com/sun/jdi/FieldWatchpoints.java                               generic-all
 
 # Filed 6402201
-com/sun/jdi/ProcessAttachTest.sh				generic-all
+com/sun/jdi/ProcessAttachTest.sh                                generic-all
 
 # Filed 6986875
-sun/tools/jps/jps-Vvml.sh					generic-all
+sun/tools/jps/jps-Vvml.sh                                       generic-all
 
 # Filed 6979016
-sun/tools/jconsole/ResourceCheckTest.sh				generic-all
+sun/tools/jconsole/ResourceCheckTest.sh                         generic-all
 
 ############################################################################
 
 # jdk_util
 
 # Filed 7027061
-java/util/Locale/Bug6989440.java				windows-all
+java/util/Locale/Bug6989440.java                                windows-all
 
 # Filed 6933803
-java/util/concurrent/ThreadPoolExecutor/CoreThreadTimeOut.java	generic-all
+java/util/concurrent/ThreadPoolExecutor/CoreThreadTimeOut.java  generic-all
 
 # Filed 7022325
 # Fails with assertion error on windows
 #   11 separate stacktraces created... file reuse problem?
-java/util/zip/ZipFile/ReadLongZipFileName.java			generic-all
+java/util/zip/ZipFile/ReadLongZipFileName.java                  generic-all
 
 # Filed 6772009
 java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java generic-all