Fix bug with ambiguous relative link targets in launcher tests

2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 0a1c445..a95e4ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2020-11-10  Jacob Bachmeyer  <jcb@gnu.org>
 
+	PR44545
+
+	* testsuite/lib/launcher.exp (link_dejagnu_launcher_test_item):
+	Use [file normalize] to ensure that link targets are unambiguous.
+
 	* testsuite/lib/launcher.exp (link_dejagnu_launcher_test_item):
 	New procedure to collect existing repeated testsuite code.
 	* testsuite/launcher.all/command.exp: Establish testing
diff --git a/testsuite/lib/launcher.exp b/testsuite/lib/launcher.exp
index 84a392f..729d7d8 100644
--- a/testsuite/lib/launcher.exp
+++ b/testsuite/lib/launcher.exp
@@ -78,7 +78,7 @@ proc try_dejagnu_launcher { launcher test } {
 proc link_dejagnu_launcher_test_item {link target} {
     verbose -log "linking $link"
     verbose -log "     to $target"
-    if {[catch {file link -symbolic $link $target} err]} {
+    if {[catch {file link -symbolic $link [file normalize $target]} err]} {
 	perror $err 0
     }
 }