aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--binutils/testsuite/config/udi.exp26
-rw-r--r--binutils/testsuite/config/unix.exp26
2 files changed, 34 insertions, 18 deletions
diff --git a/binutils/testsuite/config/udi.exp b/binutils/testsuite/config/udi.exp
index d71e3e9..29ea0d8 100644
--- a/binutils/testsuite/config/udi.exp
+++ b/binutils/testsuite/config/udi.exp
@@ -21,15 +21,23 @@
load_lib util-defs.exp
-#
-# nm_version -- extract and print the version number of nm
-#
-proc nm_version { } {
- set tmp [exec $NM +version]
- regexp " \[0-9\.\]+" $tmp version
- clone_output "[which $NM] version $version\n"
- unset tmp
- unset version
+if ![info exists NM] then {
+ set NM [transform nm]
+}
+if ![info exists NMFLAGS] then {
+ set NMFLAGS ""
+}
+if ![info exists SIZE] then {
+ set SIZE [transform size]
+}
+if ![info exists SIZEFLAGS] then {
+ set SIZEFLAGS ""
+}
+if ![info exists OBJDUMP] then {
+ set OBJDUMP [transform objdump]
+}
+if ![info exists OBJDUMPFLAGS] then {
+ set OBJDUMPFLAGS ""
}
#
diff --git a/binutils/testsuite/config/unix.exp b/binutils/testsuite/config/unix.exp
index d71e3e9..29ea0d8 100644
--- a/binutils/testsuite/config/unix.exp
+++ b/binutils/testsuite/config/unix.exp
@@ -21,15 +21,23 @@
load_lib util-defs.exp
-#
-# nm_version -- extract and print the version number of nm
-#
-proc nm_version { } {
- set tmp [exec $NM +version]
- regexp " \[0-9\.\]+" $tmp version
- clone_output "[which $NM] version $version\n"
- unset tmp
- unset version
+if ![info exists NM] then {
+ set NM [transform nm]
+}
+if ![info exists NMFLAGS] then {
+ set NMFLAGS ""
+}
+if ![info exists SIZE] then {
+ set SIZE [transform size]
+}
+if ![info exists SIZEFLAGS] then {
+ set SIZEFLAGS ""
+}
+if ![info exists OBJDUMP] then {
+ set OBJDUMP [transform objdump]
+}
+if ![info exists OBJDUMPFLAGS] then {
+ set OBJDUMPFLAGS ""
}
#