diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2006-03-24 01:59:35 +0000 |
|---|---|---|
| committer | Joseph Myers <jsm28@gcc.gnu.org> | 2006-03-24 01:59:35 +0000 |
| commit | b5b3739a4618fd9769d19ef2fb77eb7e1cbaa04d (patch) | |
| tree | cd0525512f15757bcbbebd6ec9f664169e8ad850 /libstdc++-v3/testsuite | |
| parent | 58bcd97431ccee6c432320e0a508c33f47fd88f2 (diff) | |
| download | gcc-b5b3739a4618fd9769d19ef2fb77eb7e1cbaa04d.zip gcc-b5b3739a4618fd9769d19ef2fb77eb7e1cbaa04d.tar.gz gcc-b5b3739a4618fd9769d19ef2fb77eb7e1cbaa04d.tar.bz2 | |
re PR libstdc++/20448 (locale testsuite fails when GCC is configured with --disable-nls)
PR libstdc++/20448
PR libstdc++/20451
* scripts/testsuite_flags.in (--cxxflags): Don't define LOCALEDIR.
* testsuite/lib/libstdc++.exp (libstdc++_init): Always define
LOCALEDIR to ".".
(v3-build_support): Build MO files.
Co-Authored-By: Joseph Myers <joseph@codesourcery.com>
From-SVN: r112346
Diffstat (limited to 'libstdc++-v3/testsuite')
| -rw-r--r-- | libstdc++-v3/testsuite/lib/libstdc++.exp | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index f93dc6e..ab364191 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -193,17 +193,12 @@ proc libstdc++_init { testfile } { set includes "-I${srcdir}" set cxxldflags "" set cxxflags "-g -O2 -D_GLIBCXX_ASSERT -fmessage-length=0" - # Guess at the location of the installed locale files. - # (It would be nice if "gcc --print-file-name" could find - # message files, but it cannot.) - set absolute_cxx [which $cxx] - if { $absolute_cxx != "" } { - set localedir "[file dirname $absolute_cxx]/../share/locale" - } - set cxxflags "$cxxflags -DLOCALEDIR=\"$localedir\"" } } + # Always use MO files built by this test harness. + set cxxflags "$cxxflags -DLOCALEDIR=\".\"" + # If a PCH file is available, use it. We must delay performing # this check until $cxx and such have been initialized because we # perform a test compilation. (Ideally, gcc --print-file-name would @@ -395,6 +390,20 @@ proc v3-build_support { } { set v3-threads 1 } + # Try to build the MO files that are used by some of the locale + # tests. If we can't build them, that's OK; it just means that + # those tests will fail. + foreach lang [list "fr" "de"] { + catch { + file mkdir "$lang/LC_MESSAGES" + remote_exec "build" "msgfmt" "-o $lang/LC_MESSAGES/libstdc++.mo $srcdir/../po/$lang.po" + if [is_remote host] { + remote_exec "host" "mkdir" "-p $lang/LC_MESSAGES" + remote_download "host" "$lang/LC_MESSAGES/libstdc++.mo" "$lang/LC_MESSAGES/libstdc++.mo" + } + } + } + # Build the support objects. set source_files \ [list testsuite_abi.cc testsuite_allocator.cc testsuite_character.cc testsuite_hooks.cc ] |