4 files changed, 18 insertions, 0 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index f9d40ff..23813fe 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-18  Yufeng Zhang  <yufeng.zhang@arm.com>
+
+        * gdb.base/ctxobj.exp: Skip if skip_shlib_tests returns true.
+        * gdb.base/print-file-var.exp: Likewise.
+        * gdb.base/type-opaque.exp: Likewise.
+
 2012-10-17  Yao Qi  <yao@codesourcery.com>
 
 	* gdb.mi/mi-memory-changed.exp: New.
diff --git a/gdb/testsuite/gdb.base/ctxobj.exp b/gdb/testsuite/gdb.base/ctxobj.exp
index b41ed38..a0eceb7 100644
--- a/gdb/testsuite/gdb.base/ctxobj.exp
+++ b/gdb/testsuite/gdb.base/ctxobj.exp
@@ -13,6 +13,10 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+if {[skip_shlib_tests]} {
+    return -1
+}
+
 set executable ctxobj-m
 
 # The sources used to build two shared libraries (SO).  We use the exact
diff --git a/gdb/testsuite/gdb.base/print-file-var.exp b/gdb/testsuite/gdb.base/print-file-var.exp
index 994abc4..03a2832 100644
--- a/gdb/testsuite/gdb.base/print-file-var.exp
+++ b/gdb/testsuite/gdb.base/print-file-var.exp
@@ -13,6 +13,10 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+if {[skip_shlib_tests]} {
+    return -1
+}
+
 set executable print-file-var-main
 
 set lib1 "print-file-var-lib1"
diff --git a/gdb/testsuite/gdb.base/type-opaque.exp b/gdb/testsuite/gdb.base/type-opaque.exp
index f91c24b..ffd4662 100644
--- a/gdb/testsuite/gdb.base/type-opaque.exp
+++ b/gdb/testsuite/gdb.base/type-opaque.exp
@@ -15,6 +15,10 @@
 
 # Test resolving of an opaque type from the loaded shared library.
 
+if {[skip_shlib_tests]} {
+    return -1
+}
+
 set testfile type-opaque-main
 set libfile type-opaque-lib
 set srcfile ${testfile}.c