1 files changed, 79 insertions, 7 deletions
diff --git a/gdb/testsuite/gdb.mi/mi-basics.exp b/gdb/testsuite/gdb.mi/mi-basics.exp
index 4913d8f..98ffe1d 100644
--- a/gdb/testsuite/gdb.mi/mi-basics.exp
+++ b/gdb/testsuite/gdb.mi/mi-basics.exp
@@ -148,26 +148,98 @@ proc test_dir_specification {} {
     global srcdir
     global subdir
 
-    # Clear the search directories, then specify one to be searched
+    # Add to the search directories, display, then reset back to default
     # Tests:
-    # -environment-directory
     # -environment-directory arg
+    # -environment-directory 
+    # -environment-directory -r
 
 #exp_internal 1
-    mi_gdb_test "202-environment-directory" \
-             "\\\^done" \
+    mi_gdb_test "202-environment-directory ${srcdir}/${subdir}" \
+             "\\\^done,source-path=\"${srcdir}/${subdir}.\\\$cdir.\\\$cwd\"" \
+             "environment-directory arg operation"
+
+    mi_gdb_test "203-environment-directory" \
+             "\\\^done,source-path=\"${srcdir}/${subdir}.\\\$cdir.\\\$cwd\"" \
+             "environment-directory empty-string operation"
+
+    mi_gdb_test "204-environment-directory -r" \
+             "\\\^done,source-path=\"\\\$cdir.\\\$cwd\"" \
              "environment-directory operation"
 
-    mi_gdb_test "203-environment-directory ${srcdir}/${subdir}" \
-             "\\\^done" \
-             "environment-directory arg operation"
 #exp_internal 0
 }
 
+proc test_cwd_specification {} {
+    global mi_gdb_prompt
+    global objdir
+    global subdir
+
+    # Change the working directory, then print the current working directory
+    # Tests:
+    # -environment-cd ${objdir}
+    # -environment-pwd
+
+    mi_gdb_test "205-environment-cd ${objdir}" \
+             "\\\^done" \
+             "environment-cd arg operation"
+
+    mi_gdb_test "206-environment-pwd" \
+             "\\\^done,cwd=\"${objdir}\"" \
+             "environment-pwd operation"
+}
+
+proc test_path_specification {} {
+    global mi_gdb_prompt
+    global orig_path
+    global objdir
+    global srcdir
+
+    # Add to the path, display, then reset 
+    # Tests:
+    # -environment-path 
+    # -environment-path dir1 dir2
+    # -environment-path -r dir
+    # -environment-path -r
+
+#exp_internal 1
+
+    send_gdb "-environment-path\n"
+    gdb_expect 20 {
+	-re "\\\^done,path=\"\(.*\)\"\r\n$mi_gdb_prompt" { 
+	  set orig_path $expect_out(1,string); 
+	}
+	timeout { 
+	  perror "-environment-path (timeout)" ; 
+	  return 
+	}
+    }
+
+    mi_gdb_test "207-environment-path" \
+             "\\\^done,path=\"$orig_path\"" \
+             "environment-path no-args operation"
+
+    mi_gdb_test "208-environment-path $srcdir $objdir" \
+             "\\\^done,path=\"$srcdir.$objdir.$orig_path\"" \
+             "environment-path dir1 dir2 operation"
+
+    mi_gdb_test "209-environment-path -r $objdir" \
+             "\\\^done,path=\"$objdir.$orig_path\"" \
+             "environment-path -r dir operation"
+
+    mi_gdb_test "210-environment-path -r" \
+             "\\\^done,path=\"$orig_path\"" \
+             "environment-path -r operation"
+
+#exp_internal 0
+} 
+
 if [test_mi_interpreter_selection] {
   test_exec_and_symbol_mi_operatons
   test_breakpoints_deletion
   test_dir_specification
+  test_cwd_specification
+  test_path_specification
 }
 
 mi_gdb_exit