From 79260be4755868f64042f25e7a7c8f1612695753 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Wed, 29 Mar 2023 08:01:42 +0200 Subject: [PATCH] [gdb/testsuite] Fix gdb.guile/guile.exp for remote host Fix test-case gdb.guile/guile.exp for remote host using gdb_remote_download. Tested on x86_64-linux. --- gdb/testsuite/gdb.guile/guile.exp | 38 +++++++++++++++++-------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/gdb/testsuite/gdb.guile/guile.exp b/gdb/testsuite/gdb.guile/guile.exp index 4db2f7cd309..7d0c063583d 100644 --- a/gdb/testsuite/gdb.guile/guile.exp +++ b/gdb/testsuite/gdb.guile/guile.exp @@ -20,6 +20,8 @@ load_lib gdb-guile.exp clean_restart +set host_source2_scm [gdb_remote_download host $srcdir/$subdir/source2.scm] + # Do this instead of the skip_guile_check. # We want to do some tests when Guile is not present. gdb_test_multiple "guile (display 23) (newline)" "verify guile support" { @@ -32,7 +34,7 @@ gdb_test_multiple "guile (display 23) (newline)" "verify guile support" { # If Guile is not supported, verify that sourcing a guile script # causes an error. - gdb_test "source $srcdir/$subdir/source2.scm" \ + gdb_test "source $host_source2_scm" \ "Error in sourced command file:.*" \ "source source2.scm when guile disabled" @@ -63,7 +65,7 @@ gdb_test_multiline "show guile command" \ "end" "" \ "show user zzq" "User command \"zzq\":.* guile.*\\(print 23\\).* end" -gdb_test "source $srcdir/$subdir/source2.scm" "yes" "source source2.scm" +gdb_test "source $host_source2_scm" "yes" "source source2.scm" gdb_test "source -s source2.scm" "yes" @@ -81,19 +83,21 @@ gdb_test "guile (print a)" "= .*aliases -- User-defined aliases of other command "verify help to uiout" # Verify that we can source a guile script using ~ for the HOME directory. -save_vars { env(HOME) } { - # Create a new directory to act as a temporary HOME directory. - set tmp_home [standard_output_file tmp_home] - file mkdir $tmp_home - - # Copy the file we want to source into the new HOME directory. - gdb_remote_download host ${srcdir}/${subdir}/source2.scm \ - ${tmp_home}/source2.scm - - # Arrange to use the new HOME directory. - set env(HOME) $tmp_home - clean_restart - - # Finally, source the file out of our new HOME directory. - gdb_test "source ~/source2.scm" "yes" +if { ![is_remote host ] } { + save_vars { env(HOME) } { + # Create a new directory to act as a temporary HOME directory. + set tmp_home [standard_output_file tmp_home] + file mkdir $tmp_home + + # Copy the file we want to source into the new HOME directory. + gdb_remote_download host ${srcdir}/${subdir}/source2.scm \ + ${tmp_home}/source2.scm + + # Arrange to use the new HOME directory. + set env(HOME) $tmp_home + clean_restart + + # Finally, source the file out of our new HOME directory. + gdb_test "source ~/source2.scm" "yes" + } } -- 2.30.2