Fix internal testsuite stubs to reflect previous changes.

3 files changed, 47 insertions, 38 deletions

diff --git a/ChangeLog b/ChangeLog
index a3a6a39..d2f8969 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2020-05-20 Jacob Bachmeyer <jcb62281+dev@gmail.com>
 
+    * testsuite/runtest.libs/target.test: Rename fake "target_info"
+    array to a fake "board_info" array, to align with changes made to
+    the DejaGnu core on 29 January 1997 that moved the target
+    configuration data into the global board_info array.
+
+    * testsuite/runtest.libs/remote.test: Likewise.
+
+2020-05-20 Jacob Bachmeyer <jcb62281+dev@gmail.com>
+
     * testsuite/runtest.libs/libs.exp: Use runtest_file_p to honor
     requests to run only some library tests.
 
diff --git a/testsuite/runtest.libs/remote.test b/testsuite/runtest.libs/remote.test
index 5450f95..8152cad 100644
--- a/testsuite/runtest.libs/remote.test
+++ b/testsuite/runtest.libs/remote.test
@@ -21,27 +21,27 @@ if [ file exists $file] {
 global errno ""
 
 #
-# Create a false target config array
+# Create a false board config array
 #
-set target_info(idp,name)       "idp"
-set target_info(idp,ldflags)    "-Tidp.ld"
-set target_info(idp,config)     m68k-unknown-aout
-set target_info(idp,cflags)     ""
-set target_info(idp,connect)    telnet
-set target_info(idp,target)     "s12"
-set target_info(idp,serial)     "tstty12"
-set target_info(idp,netport)    "localhost:23"
-set target_info(idp,baud)       "9600"
+set board_info(idp,name)       "idp"
+set board_info(idp,ldflags)    "-Tidp.ld"
+set board_info(idp,config)     m68k-unknown-aout
+set board_info(idp,cflags)     ""
+set board_info(idp,connect)    telnet
+set board_info(idp,target)     "s12"
+set board_info(idp,serial)     "tstty12"
+set board_info(idp,netport)    "localhost:23"
+set board_info(idp,baud)       "9600"
 # MVME target
-set target_info(mvme,name)      "mvme"
-set target_info(mvme,ldflags)   "-Tmvme.ld"
-set target_info(mvme,config)    m68k-unknown-aout
-set target_info(mvme,cflags)    ""
-set target_info(mvme,connect)   telnet
-set target_info(mvme,target)    "s12"
-set target_info(mvme,serial)    "tstty8"
-set target_info(mvme,netport)   "localhost:23"
-set target_info(mvme,baud)      "9600"
+set board_info(mvme,name)      "mvme"
+set board_info(mvme,ldflags)   "-Tmvme.ld"
+set board_info(mvme,config)    m68k-unknown-aout
+set board_info(mvme,cflags)    ""
+set board_info(mvme,connect)   telnet
+set board_info(mvme,target)    "s12"
+set board_info(mvme,serial)    "tstty8"
+set board_info(mvme,netport)   "localhost:23"
+set board_info(mvme,baud)      "9600"
 
 # Test remote open. We try not to use any of the support procs in
 # target.exp to for isolation testing. "target" is the name of the
diff --git a/testsuite/runtest.libs/target.test b/testsuite/runtest.libs/target.test
index 470b4d3..dd3a156 100644
--- a/testsuite/runtest.libs/target.test
+++ b/testsuite/runtest.libs/target.test
@@ -33,27 +33,27 @@ if [ file exists $file] {
 }
 
 #
-# Create a false target config array
+# Create a false board config array
 #
-set target_info(idp,name)       "idp"
-set target_info(idp,ldflags)    "-Tidp.ld"
-set target_info(idp,config)     m68k-unknown-aout
-set target_info(idp,cflags)     ""
-set target_info(idp,connect)    "telnet"
-set target_info(idp,target)     "s12"
-set target_info(idp,serial)     "tstty12"
-set target_info(idp,netport)    "localhost:23"
-set target_info(idp,baud)       "9600"
+set board_info(idp,name)       "idp"
+set board_info(idp,ldflags)    "-Tidp.ld"
+set board_info(idp,config)     m68k-unknown-aout
+set board_info(idp,cflags)     ""
+set board_info(idp,connect)    "telnet"
+set board_info(idp,target)     "s12"
+set board_info(idp,serial)     "tstty12"
+set board_info(idp,netport)    "localhost:23"
+set board_info(idp,baud)       "9600"
 # MVME target
-set target_info(mvme,name)      "mvme"
-set target_info(mvme,ldflags)   "-Tmvme.ld"
-set target_info(mvme,config)    m68k-unknown-aout
-set target_info(mvme,cflags)    ""
-set target_info(mvme,connect)   "telnet"
-set target_info(mvme,target)    "s12"
-set target_info(mvme,serial)    "tstty8"
-set target_info(mvme,netport)   "localhost:23"
-set target_info(mvme,baud)      "9600"
+set board_info(mvme,name)      "mvme"
+set board_info(mvme,ldflags)   "-Tmvme.ld"
+set board_info(mvme,config)    m68k-unknown-aout
+set board_info(mvme,cflags)    ""
+set board_info(mvme,connect)   "telnet"
+set board_info(mvme,target)    "s12"
+set board_info(mvme,serial)    "tstty8"
+set board_info(mvme,netport)   "localhost:23"
+set board_info(mvme,baud)      "9600"
 
 # test push_config target
 push_config target idp