aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libstdc++-v3/ChangeLog7
-rw-r--r--libstdc++-v3/testsuite/lib/libstdc++.exp5
2 files changed, 12 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index be9364c..3580f39 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2015-04-27 Sandra Loosemore <sandra@codesourcery.com>
+
+ PR libstdc++/65909
+ * testsuite/lib/libstdc++.exp (check_v3_target_namedlocale):
+ Make the generated test program fail gracefully if the target
+ doesn't support passing command-line arguments.
+
2015-04-27 Federico Lenarduzzi <federico.lenarduzzi@tallertechnologies.com>
Jonathan Wakely <jwakely@redhat.com>
diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index 6a6374a..d581a53 100644
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -901,6 +901,11 @@ proc check_v3_target_namedlocale { args } {
puts $f "using namespace std;"
puts $f "int main (int argc, char** argv)"
puts $f "{"
+ puts $f " if (argc < 2)"
+ puts $f " {"
+ puts $f " printf(\"locale support test not supported\\n\");"
+ puts $f " return 1;"
+ puts $f " }"
puts $f " try"
puts $f " {"
puts $f " locale(*(argv + 1));"