Skip to content

Remove dependancy on fflush from ErrorFormatter and CXXTEST_HAVE_STD from TestMain #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yazug wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Remove dependancy on fflush from ErrorFormatter and CXXTEST_HAVE_STD from TestMain #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
153d450
CXXTEST_HAVE_STD is nolonger forced in TestMain.h. Will not pull in s…
pi-tvd Mar 1, 2013
0e128ee
removed rogue call to fflush using stdout
pi-tvd Mar 1, 2013
d6b2512
Merge commit 'tags/4.2.1'
pi-tvd Apr 2, 2013
2be53cc
removing rogue call to fflush using stdout (a previous change that go…
pi-tvd May 24, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions cxxtest/ErrorFormatter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,10 @@ class ErrorFormatter : public TestListener {
if (tracker().testSkipped()) {
(*_o) << "s";
_o->flush();
fflush(stdout);
_dotting = true;
} else if (!tracker().testFailed()) {
(*_o) << ".";
_o->flush();
fflush(stdout);
_dotting = true;
}
}
Expand Down
8 changes: 5 additions & 3 deletions cxxtest/TestMain.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,11 @@
#include <cxxtest/TestTracker.h>
#include <cxxtest/Flags.h>

#ifndef _CXXTEST_HAVE_STD
# define _CXXTEST_HAVE_STD
#endif // _CXXTEST_HAVE_STD

#include <cxxtest/StdValueTraits.h>



#if defined(_CXXTEST_HAVE_STD)
#ifdef _CXXTEST_OLD_STD
# include <iostream.h>
Expand All @@ -30,6 +29,7 @@
# include <cstring>
#endif // _CXXTEST_OLD_STD


namespace CxxTest {

inline void print_help(const char* name) {
Expand All @@ -40,6 +40,8 @@ inline void print_help(const char* name) {
CXXTEST_STD(cerr) << name << " --help-tests" << CXXTEST_STD(endl);
CXXTEST_STD(cerr) << name << " -v Enable tracing output." << CXXTEST_STD(endl);
}
#else
namespace CxxTest {
#endif


Expand Down