From: cherierm Date: Fri, 27 Jun 2008 13:03:42 +0000 (+0000) Subject: By default, the output of floating point numbers by functions such as printf, wprintf... X-Git-Tag: v3.3~262 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/824be6a65be336a4727708bc364cecddd6c7f5ca?hp=eff676f69a1e885f40f66b5aa5873d70782efe8e By default, the output of floating point numbers by functions such as printf, wprintf, and related functions in the Visual C++ Standard C library prints three digits for the exponent. So I change this behavior by using the function _set_output_format. Otherwise tesh detect an output difference in test file relative with send/receive and priority samples. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5844 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/examples/msg/priority/priority.c b/examples/msg/priority/priority.c index 135c2b7f55..291039d49b 100644 --- a/examples/msg/priority/priority.c +++ b/examples/msg/priority/priority.c @@ -61,6 +61,11 @@ static MSG_error_t test_all(const char *platform_file, int main(int argc, char *argv[]) { MSG_error_t res = MSG_OK; + + #ifdef _MSC_VER + unsigned int prev_exponent_format = _set_output_format(_TWO_DIGIT_EXPONENT); + #endif + MSG_global_init(&argc,argv); if (argc < 3) { @@ -70,6 +75,10 @@ int main(int argc, char *argv[]) } res = test_all(argv[1],argv[2]); MSG_clean(); + + #ifdef _MSC_VER + _set_output_format(prev_exponent_format); + #endif if(res==MSG_OK) return 0; diff --git a/examples/msg/sendrecv/sendrecv.c b/examples/msg/sendrecv/sendrecv.c index 22720ab345..0f5051facc 100644 --- a/examples/msg/sendrecv/sendrecv.c +++ b/examples/msg/sendrecv/sendrecv.c @@ -128,6 +128,8 @@ MSG_error_t test_all(const char *platform_file, MSG_error_t res = MSG_OK; + + INFO0("test_all"); /* Simulation setting */ @@ -142,6 +144,7 @@ MSG_error_t test_all(const char *platform_file, MSG_launch_application(application_file); res = MSG_main(); + return res; } /* end_of_test_all */ @@ -150,7 +153,10 @@ MSG_error_t test_all(const char *platform_file, int main(int argc, char *argv[]) { MSG_error_t res = MSG_OK; - + + #ifdef _MSC_VER + unsigned int prev_exponent_format = _set_output_format(_TWO_DIGIT_EXPONENT); + #endif MSG_global_init(&argc,argv); @@ -176,6 +182,10 @@ int main(int argc, char *argv[]) MSG_clean(); + #ifdef _MSC_VER + _set_output_format(prev_exponent_format); + #endif + if(res==MSG_OK) return 0; else return 1; } /* end_of_main */