projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge of cppccheck fixes.
[m6w6/libmemcached]
/
libtest
/
main.cc
diff --git
a/libtest/main.cc
b/libtest/main.cc
index 3ae8ff988ebe14e0662dd9cd49b99ee582dab703..453d29668afdfb45d7f2cdd5f07182dcb6535d28 100644
(file)
--- a/
libtest/main.cc
+++ b/
libtest/main.cc
@@
-88,6
+88,17
@@
int main(int argc, char *argv[])
std::string collection_to_run;
std::string wildcard;
std::string collection_to_run;
std::string wildcard;
+ /*
+ Valgrind does not currently work reliably, or sometimes at all, on OSX
+ - Fri Jun 15 11:24:07 EDT 2012
+ */
+#if defined(TARGET_OS_OSX) && TARGET_OS_OSX
+ if (valgrind_is_caller())
+ {
+ return EXIT_SKIP;
+ }
+#endif
+
// Options parsing
{
enum long_option_t {
// Options parsing
{
enum long_option_t {
@@
-176,11
+187,21
@@
int main(int argc, char *argv[])
}
}
}
}
+ if ((bool(getenv("YATL_RUN_MASSIVE_TESTS"))) or opt_massive)
+ {
+ opt_massive= true;
+ }
+
if (opt_quiet)
{
close(STDOUT_FILENO);
}
if (opt_quiet)
{
close(STDOUT_FILENO);
}
+ if (opt_massive)
+ {
+ is_massive(opt_massive);
+ }
+
char buffer[1024];
if (getenv("LIBTEST_TMP"))
{
char buffer[1024];
if (getenv("LIBTEST_TMP"))
{
@@
-250,10
+271,10
@@
int main(int argc, char *argv[])
break;
case TEST_SKIPPED:
break;
case TEST_SKIPPED:
- Out << "SKIP " << argv[0];
- return EXIT_SUCCESS;
+ return EXIT_SKIP;
case TEST_FAILURE:
case TEST_FAILURE:
+ std::cerr << "frame->create()" << std::endl;
return EXIT_FAILURE;
}
}
return EXIT_FAILURE;
}
}
@@
-292,7
+313,7
@@
int main(int argc, char *argv[])
}
catch (libtest::fatal& e)
{
}
catch (libtest::fatal& e)
{
- std::cerr << e.what() << std::endl;
+ std::cerr <<
"FATAL:" <<
e.what() << std::endl;
exit_code= EXIT_FAILURE;
}
catch (libtest::disconnected& e)
exit_code= EXIT_FAILURE;
}
catch (libtest::disconnected& e)
@@
-302,7
+323,12
@@
int main(int argc, char *argv[])
}
catch (std::exception& e)
{
}
catch (std::exception& e)
{
- std::cerr << e.what() << std::endl;
+ std::cerr << "std::exception:" << e.what() << std::endl;
+ exit_code= EXIT_FAILURE;
+ }
+ catch (char const*)
+ {
+ std::cerr << "Exception:" << std::endl;
exit_code= EXIT_FAILURE;
}
catch (...)
exit_code= EXIT_FAILURE;
}
catch (...)