diff options
Diffstat (limited to 'libstdc++-v3/testsuite/util/testsuite_hooks.cc')
| -rw-r--r-- | libstdc++-v3/testsuite/util/testsuite_hooks.cc | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/libstdc++-v3/testsuite/util/testsuite_hooks.cc b/libstdc++-v3/testsuite/util/testsuite_hooks.cc index 6ea82f3d908..35ac5b2836f 100644 --- a/libstdc++-v3/testsuite/util/testsuite_hooks.cc +++ b/libstdc++-v3/testsuite/util/testsuite_hooks.cc @@ -92,17 +92,17 @@ namespace __gnu_test setrlimit(RLIMIT_VMEM, &r); #endif - // Virtual memory. - // On x86_64-linux, the default is -z max-page-size=0x200000 - // which means up to 2MB of address space are accounted for - // PROT_NONE mappings between text and data segments of - // each shared library. There are 4 shared libs involved - // in addition to the dynamic linker. Use at least 16MB address space - // limit. + // Virtual memory. On x86_64-linux, the default is -z + // max-page-size=0x200000 which means up to 2MB of address space + // are accounted for PROT_NONE mappings between text and data + // segments of each shared library. There are 4 shared libs + // involved in addition to the dynamic linker, maybe 5 if libgomp + // is being used as well. Use at least 20MB address space limit. #if defined(__x86_64__) && defined(__linux__) - if (limit < 16777216) - limit = 16777216; + if (limit < 20971520) + limit = 20971520; #endif + // On HP-UX 11.23, a trivial C++ program that sets RLIMIT_AS to // anything less than 128MB cannot "malloc" even 1K of memory. // Therefore, we skip RLIMIT_AS on HP-UX. @@ -173,7 +173,6 @@ namespace __gnu_test run_tests_wrapped_locale(const char* name, const func_callback& l) { using namespace std; - bool test = true; // Set the global locale. locale loc_name = locale(name); @@ -202,7 +201,6 @@ namespace __gnu_test const func_callback& l) { using namespace std; - bool test = true; #ifdef _GLIBCXX_HAVE_SETENV // Set the global locale. @@ -334,4 +332,4 @@ namespace __gnu_test tmp.tm_isdst = isdst; return tmp; } -}; // namespace __gnu_test +} // namespace __gnu_test |