aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/testsuite/ChangeLog6
-rw-r--r--gdb/testsuite/gdb.base/comp-dir/subdir/dummy.txt1
-rw-r--r--gdb/testsuite/gdb.base/completion.exp5
3 files changed, 8 insertions, 4 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index eaff211..ff1b009 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,11 @@
2010-02-16 Daniel Jacobowitz <dan@codesourcery.com>
+ * gdb.base/comp-dir/subdir/dummy.txt: New file.
+ * gdb.base/completion.exp: Use comp-dir/subdir instead of creating
+ a temporary directory.
+
+2010-02-16 Daniel Jacobowitz <dan@codesourcery.com>
+
* gdb.base/charset.exp: Use a single regular expression to match
show host-charset and show target-charset output.
diff --git a/gdb/testsuite/gdb.base/comp-dir/subdir/dummy.txt b/gdb/testsuite/gdb.base/comp-dir/subdir/dummy.txt
new file mode 100644
index 0000000..b10a2c3
--- /dev/null
+++ b/gdb/testsuite/gdb.base/comp-dir/subdir/dummy.txt
@@ -0,0 +1 @@
+For completion.exp
diff --git a/gdb/testsuite/gdb.base/completion.exp b/gdb/testsuite/gdb.base/completion.exp
index 68be35d..53d021a 100644
--- a/gdb/testsuite/gdb.base/completion.exp
+++ b/gdb/testsuite/gdb.base/completion.exp
@@ -724,14 +724,11 @@ gdb_test "cd ${fullsrcdir}" \
# GDB used to fail adding / on directories, on the first try only.
-# Do not use the `completion' start here as it would conflict with the
-# testcase (complete 'file ./gdb.base/complet') expectations.
-set uniquedir ${objdir}/${subdir}/compl-uNiQuEdIr
+set uniquedir ../testsuite/gdb.base/comp-dir
set escapeduniquedir [string_to_regexp ${uniquedir}]
set uniquesu subdi
set uniquesub ${uniquesu}r
set escapeuniquesub [string_to_regexp ${uniquesub}]
-file mkdir ${uniquedir}/${uniquesub}
send_gdb "dir ${uniquedir}\t"
gdb_expect {
-re "${escapeduniquedir}/" {