[PATCH] [LD] Improved check for error messages in tests

[Sebastian Huber]

ld/testsuite/ChangeLog
2013-07-19  Sebastian Huber  <sebastian.huber@embedded-brains.de>

	* ld-scripts/script.exp: Use run_dump_test instead of
	ld_simple_link to check the error message.
	* ld-scripts/align-with-input.d: New file.
	* ld-scripts/region-alias-1.d: Likewise.
	* ld-scripts/region-alias-2.d: Likewise.
	* ld-scripts/region-alias-3.d: Likewise.
	* ld-scripts/region-alias-4.d: Likewise.
---
 ld/testsuite/ld-scripts/align-with-input.d |    3 +++
 ld/testsuite/ld-scripts/region-alias-1.d   |    3 +++
 ld/testsuite/ld-scripts/region-alias-2.d   |    3 +++
 ld/testsuite/ld-scripts/region-alias-3.d   |    3 +++
 ld/testsuite/ld-scripts/region-alias-4.d   |    3 +++
 ld/testsuite/ld-scripts/script.exp         |   15 ++-------------
 6 files changed, 17 insertions(+), 13 deletions(-)
 create mode 100644 ld/testsuite/ld-scripts/align-with-input.d
 create mode 100644 ld/testsuite/ld-scripts/region-alias-1.d
 create mode 100644 ld/testsuite/ld-scripts/region-alias-2.d
 create mode 100644 ld/testsuite/ld-scripts/region-alias-3.d
 create mode 100644 ld/testsuite/ld-scripts/region-alias-4.d

diff --git a/ld/testsuite/ld-scripts/align-with-input.d b/ld/testsuite/ld-scripts/align-with-input.d
new file mode 100644
index 0000000..f9c30d3
--- /dev/null
+++ b/ld/testsuite/ld-scripts/align-with-input.d
@@ -0,0 +1,3 @@
+#source: script.s
+#ld: -T align-with-input.t
+#error: .*:[0-9]+: error: align with input and explicit align specified
diff --git a/ld/testsuite/ld-scripts/region-alias-1.d b/ld/testsuite/ld-scripts/region-alias-1.d
new file mode 100644
index 0000000..35a3931
--- /dev/null
+++ b/ld/testsuite/ld-scripts/region-alias-1.d
@@ -0,0 +1,3 @@
+#source: script.s
+#ld: -T region-alias-1.t
+#error: .*:[0-9]+: error: redefinition of memory region alias `MY_ALIAS'
diff --git a/ld/testsuite/ld-scripts/region-alias-2.d b/ld/testsuite/ld-scripts/region-alias-2.d
new file mode 100644
index 0000000..c18ccb3
--- /dev/null
+++ b/ld/testsuite/ld-scripts/region-alias-2.d
@@ -0,0 +1,3 @@
+#source: script.s
+#ld: -T region-alias-2.t
+#error: .*:[0-9]+: error: memory region `NIL' for alias `MY_ALIAS' does not exist
diff --git a/ld/testsuite/ld-scripts/region-alias-3.d b/ld/testsuite/ld-scripts/region-alias-3.d
new file mode 100644
index 0000000..cc953b7
--- /dev/null
+++ b/ld/testsuite/ld-scripts/region-alias-3.d
@@ -0,0 +1,3 @@
+#source: script.s
+#ld: -T region-alias-3.t
+#error: .*:[0-9]+: error: alias for default memory region
diff --git a/ld/testsuite/ld-scripts/region-alias-4.d b/ld/testsuite/ld-scripts/region-alias-4.d
new file mode 100644
index 0000000..b02d45c
--- /dev/null
+++ b/ld/testsuite/ld-scripts/region-alias-4.d
@@ -0,0 +1,3 @@
+#source: script.s
+#ld: -T region-alias-4.t
+#error: .*:[0-9]+: error: alias for default memory region
diff --git a/ld/testsuite/ld-scripts/script.exp b/ld/testsuite/ld-scripts/script.exp
index cc099a9..41432f9 100644
--- a/ld/testsuite/ld-scripts/script.exp
+++ b/ld/testsuite/ld-scripts/script.exp
@@ -129,18 +129,7 @@ if ![ld_simple_link $ld tmpdir/script "$flags -T $srcdir/$subdir/memory.t tmpdir
 set test_script_list [lsort [glob $srcdir/$subdir/region-alias-*.t]]
 
 foreach test_script $test_script_list {
-    set testname [file tail $test_script]
-    if ![ld_simple_link $ld tmpdir/script "$flags -T $test_script tmpdir/script.o"] {
-        xfail "REGION_ALIAS: $testname"
-    } else {
-        xpass "REGION_ALIAS: $testname"
-    }
+    run_dump_test [string range $test_script 0 end-2]
 }
 
-set testname "ALIGN_WITH_INPUT"
-
-if ![ld_simple_link $ld tmpdir/script "$flags -T $srcdir/$subdir/align-with-input.t tmpdir/script.o"] {
-    xfail $testname
-} else {
-    xpass $testname
-}
+run_dump_test "align-with-input"
-- 
1.7.7