diff options
| author | Patrick Simianer <p@simianer.de> | 2014-01-28 15:35:31 +0100 |
|---|---|---|
| committer | Patrick Simianer <p@simianer.de> | 2014-01-28 15:35:31 +0100 |
| commit | 9c9ba8954358f791a818b3eefda2c0eb805bbd97 (patch) | |
| tree | 0153350406bf1c9c6aafa8e5da5d4b3feb9cd0c9 /klm/util/file_piece_test.cc | |
| parent | 1b0d40959f529b67db3b9d10dbf93101e0c65c7c (diff) | |
| parent | 19de646f60d4fb52ddd26d25e06f50f8717fd988 (diff) | |
resolv conflict in mira
Diffstat (limited to 'klm/util/file_piece_test.cc')
| -rw-r--r-- | klm/util/file_piece_test.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/klm/util/file_piece_test.cc b/klm/util/file_piece_test.cc index 7336007d..4361877f 100644 --- a/klm/util/file_piece_test.cc +++ b/klm/util/file_piece_test.cc @@ -1,4 +1,4 @@ -// Tests might fail if you have creative characters in your path. Sue me. +// Tests might fail if you have creative characters in your path. Sue me. #include "util/file_piece.hh" #include "util/file.hh" @@ -55,7 +55,7 @@ BOOST_AUTO_TEST_CASE(MMapReadLine) { #if !defined(_WIN32) && !defined(_WIN64) && !defined(__APPLE__) /* Apple isn't happy with the popen, fileno, dup. And I don't want to - * reimplement popen. This is an issue with the test. + * reimplement popen. This is an issue with the test. */ /* read() implementation */ BOOST_AUTO_TEST_CASE(StreamReadLine) { @@ -67,7 +67,7 @@ BOOST_AUTO_TEST_CASE(StreamReadLine) { FILE *catter = popen(popen_args.c_str(), "r"); BOOST_REQUIRE(catter); - + FilePiece test(dup(fileno(catter)), "file_piece.cc", NULL, 1); std::string ref_line; while (getline(ref, ref_line)) { @@ -107,8 +107,8 @@ BOOST_AUTO_TEST_CASE(PlainZipReadLine) { } // gzip stream. Apple doesn't like popen, fileno, dup. This is an issue with -// the test. -#ifndef __APPLE__ +// the test. +#if !defined __APPLE__ && !defined __MINGW32__ BOOST_AUTO_TEST_CASE(StreamZipReadLine) { std::fstream ref(FileLocation().c_str(), std::ios::in); @@ -117,7 +117,7 @@ BOOST_AUTO_TEST_CASE(StreamZipReadLine) { FILE * catter = popen(command.c_str(), "r"); BOOST_REQUIRE(catter); - + FilePiece test(dup(fileno(catter)), "file_piece.cc.gz", NULL, 1); std::string ref_line; while (getline(ref, ref_line)) { |