changeset 6847:eac032b93d19

Merge
author asaha
date Wed, 11 Sep 2013 15:33:01 -0700
parents 1b998b8306b9 8b32ded99544
children a5a90a118ce0
files
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Sep 10 15:39:41 2013 -0700
+++ b/.hgtags	Wed Sep 11 15:33:01 2013 -0700
@@ -353,3 +353,4 @@
 2f01847eb9530ed5ec08b1b663f3a02cac57b048 jdk7u45-b08
 6e2313d45f0c50d824531b32d3f577aa0b357551 jdk7u45-b09
 d4506b816f63330489e00ba0b9e3c6583a8a9efa jdk7u45-b10
+ee87452ba9e2b4b7d847bd2a7910a8aaeacfea7b jdk7u45-b11
--- a/test/java/io/IOException/LastErrorString.java	Tue Sep 10 15:39:41 2013 -0700
+++ b/test/java/io/IOException/LastErrorString.java	Wed Sep 11 15:33:01 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -22,7 +22,8 @@
  */
 
 /* @test
-   @bug 4167937
+   @bug 4167937 8023964
+   @ignore Test truncates system files when run as root, see 7042603
    @summary Test code paths that use the JVM_LastErrorString procedure
  */