3 files changed, 15 insertions, 6 deletions
diff --git a/gdb/testsuite/gdb.ctf/cross-tu-cyclic.exp b/gdb/testsuite/gdb.ctf/cross-tu-cyclic.exp
index 0292e394646..68b5beec157 100644
--- a/gdb/testsuite/gdb.ctf/cross-tu-cyclic.exp
+++ b/gdb/testsuite/gdb.ctf/cross-tu-cyclic.exp
@@ -24,15 +24,18 @@ standard_testfile cross-tu-cyclic-1.c  cross-tu-cyclic-2.c \
 set opts {}
 lappend opts additional_flags=-gctf
 lappend opts ldflags=-Wl,--export-dynamic
-lappend opts ldflags=-Wl,--strip-debug
 lappend opts nowarning
 
-if { [prepare_for_testing "failed to prepare" ${testfile} \
+if { [build_executable "failed to prepare" ${testfile} \
 	  [list $srcfile $srcfile2 $srcfile3 $srcfile4] \
 	  $opts] } {
     return 0
 }
 
+clean_restart
+gdb_test_no_output "set always-read-ctf on"
+gdb_load $binfile
+
 # Same thing with struct and union.
 gdb_test "ptype struct A" "type = struct A \{\[\r\n\]+\[ \t\]+struct B \\*foo;\[\r\n\]+\}.*" "ptype structure A"
 gdb_test "ptype struct B" "type = struct B \{\[\r\n\]+\[ \t\]+struct B \\*next;\[\r\n\]+\}.*" "ptype structure B"
diff --git a/gdb/testsuite/gdb.ctf/funcreturn.exp b/gdb/testsuite/gdb.ctf/funcreturn.exp
index 64ed031f693..ef1fe90e527 100644
--- a/gdb/testsuite/gdb.ctf/funcreturn.exp
+++ b/gdb/testsuite/gdb.ctf/funcreturn.exp
@@ -30,14 +30,17 @@ standard_testfile whatis.c
 set opts {}
 lappend opts additional_flags=-gctf
 lappend opts ldflags=-Wl,--export-dynamic
-lappend opts ldflags=-Wl,--strip-debug
 lappend opts nowarning
 
-if { [prepare_for_testing "failed to prepare" ${testfile} \
+if { [build_executable "failed to prepare" ${testfile} \
 	  [list $srcfile] $opts] } {
     return 0
 }
 
+clean_restart
+gdb_test_no_output "set always-read-ctf on"
+gdb_load $binfile
+
 # test print command with functions return type
 set void "(void|)"
 gdb_test "print v_char_func" \
diff --git a/gdb/testsuite/gdb.ctf/multi.exp b/gdb/testsuite/gdb.ctf/multi.exp
index c82d1b952e3..0bb66cd2432 100644
--- a/gdb/testsuite/gdb.ctf/multi.exp
+++ b/gdb/testsuite/gdb.ctf/multi.exp
@@ -23,15 +23,18 @@ standard_testfile ctf-a.c ctf-b.c ctf-c.c
 set opts {}
 lappend opts additional_flags=-gctf
 lappend opts ldflags=-Wl,--export-dynamic
-lappend opts ldflags=-Wl,--strip-debug
 lappend opts nowarning
 
-if { [prepare_for_testing "failed to prepare" ${testfile} \
+if { [build_executable "failed to prepare" ${testfile} \
 	  [list $srcfile $srcfile2 $srcfile3] \
 	  $opts] } {
     return 0
 }
 
+clean_restart
+gdb_test_no_output "set always-read-ctf on"
+gdb_load $binfile
+
 # Same thing with struct and union.
 gdb_test "ptype struct A" "type = struct A \{\[\r\n\]+\[ \t\]+struct B \\*b;\[\r\n\]+\[ \t\]+struct A \\*next;\[\r\n\]+\}.*" "ptype structure A"
 gdb_test "ptype struct B" "type = struct B \{\[\r\n\]+\[ \t\]+struct C \\*c;\[\r\n\]+\[ \t\]+int \\wombat;\[\r\n\]+\}.*" "ptype structure B"