From 0e04de0f9ceb02fe1414baa3f33ab98bc4a659f0 Mon Sep 17 00:00:00 2001
From: Pankaj Bansal <pbansal@openjdk.org>
Date: Wed, 31 Oct 2018 14:22:48 +0530
Subject: [PATCH] 8212903: [TestBug] Tests
 test/jdk/javax/swing/LookAndFeel/8145547/DemandGTK2.sh and DemandGTK3.sh fail
 on Ubuntu 18.04 LTS

Reviewed-by: prr, psadhukhan
---
 test/jdk/javax/swing/LookAndFeel/8145547/DemandGTK2.sh | 7 ++++---
 test/jdk/javax/swing/LookAndFeel/8145547/DemandGTK3.sh | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/test/jdk/javax/swing/LookAndFeel/8145547/DemandGTK2.sh b/test/jdk/javax/swing/LookAndFeel/8145547/DemandGTK2.sh
index fb4af25d2ec..eddae8748a7 100644
--- a/test/jdk/javax/swing/LookAndFeel/8145547/DemandGTK2.sh
+++ b/test/jdk/javax/swing/LookAndFeel/8145547/DemandGTK2.sh
@@ -1,7 +1,7 @@
 #!/bin/ksh -p
 
 #
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2018, 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
@@ -27,6 +27,7 @@
 #   @summary  Try to force GTK2. We must bail out to GTK3 (if any) if no 2 available.
 #
 #   @key headful
+#   @bug 8156128 8212903
 #   @compile ProvokeGTK.java
 #   @requires os.family == "linux"
 #   @run shell/timeout=400 DemandGTK2.sh
@@ -61,12 +62,12 @@ then
         exit 1
     fi
     echo "No GTK 2 library found: we should bail out to 3"
-    strace -o strace.log -fe open ${TESTJAVA}/bin/java  -cp ${TESTCLASSPATH}  -Djdk.gtk.version=2 ProvokeGTK
+    strace -o strace.log -fe open,openat ${TESTJAVA}/bin/java  -cp ${TESTCLASSPATH}  -Djdk.gtk.version=2 ProvokeGTK
     EXECRES=$?
     grep  'libgtk-3.*=\ *[0-9]*$' strace.log > logg
 else
     echo "There is GTK 2 library: we should use it"
-    strace -o strace.log -fe open ${TESTJAVA}/bin/java  -cp ${TESTCLASSPATH}  -Djdk.gtk.version=2 ProvokeGTK
+    strace -o strace.log -fe open,openat ${TESTJAVA}/bin/java  -cp ${TESTCLASSPATH}  -Djdk.gtk.version=2 ProvokeGTK
     EXECRES=$?
     grep  'libgtk-x11.*=\ *[0-9]*$' strace.log > logg
 fi
diff --git a/test/jdk/javax/swing/LookAndFeel/8145547/DemandGTK3.sh b/test/jdk/javax/swing/LookAndFeel/8145547/DemandGTK3.sh
index ec14f9bf21d..bb00493c862 100644
--- a/test/jdk/javax/swing/LookAndFeel/8145547/DemandGTK3.sh
+++ b/test/jdk/javax/swing/LookAndFeel/8145547/DemandGTK3.sh
@@ -1,7 +1,7 @@
 #!/bin/ksh -p
 
 #
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2018, 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
@@ -28,6 +28,7 @@
 #   @summary  Try to force GTK3. We must bail out to GTK2 if no 3 available.
 #
 #   @key headful
+#   @bug 8156128 8212903
 #   @compile ProvokeGTK.java
 #   @requires os.family == "linux"
 #   @run shell/timeout=400 DemandGTK3.sh
@@ -54,12 +55,12 @@ if [ "${HAVE_3}" = "0" ]
 then
     
     echo "No GTK 3 library found: we should bail out to 2"
-    strace -o strace.log -fe open ${TESTJAVA}/bin/java  -cp ${TESTCLASSPATH}  -Djdk.gtk.version=3 ProvokeGTK
+    strace -o strace.log -fe open,openat ${TESTJAVA}/bin/java  -cp ${TESTCLASSPATH}  -Djdk.gtk.version=3 ProvokeGTK
     EXECRES=$?
     grep  'libgtk-x11.*=\ *[0-9]*$' strace.log > logg
 else
     echo "There is GTK 3 library: we should use it"
-    strace -o strace.log -fe open ${TESTJAVA}/bin/java  -cp ${TESTCLASSPATH}  -Djdk.gtk.version=3 ProvokeGTK
+    strace -o strace.log -fe open,openat ${TESTJAVA}/bin/java  -cp ${TESTCLASSPATH}  -Djdk.gtk.version=3 ProvokeGTK
     EXECRES=$?
     grep  'libgtk-3.*=\ *[0-9]*$' strace.log > logg
 fi