From 4360267cb22daec5e7e35d4b96d56dac4879feb5 Mon Sep 17 00:00:00 2001 From: Jared Mulconry Date: Mon, 25 Sep 2017 22:58:47 +1000 Subject: [PATCH] Replaced flakey macros with specific functions to serve the purpose --- test/unit/utDefaultIOStream.cpp | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/test/unit/utDefaultIOStream.cpp b/test/unit/utDefaultIOStream.cpp index 9ef2bad..9335007 100644 --- a/test/unit/utDefaultIOStream.cpp +++ b/test/unit/utDefaultIOStream.cpp @@ -44,10 +44,20 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #if defined(__GNUC__) || defined(__clang__) -#define MAKE_TEMP_FILE_NAME mktemp +#define TMP_PATH "/tmp/" +void MakeTmpFilePath(char* tmplate) +{ + auto err = mkstemp(tmplate); + ASSERT_NE(err, -1); +} #elif defined(_MSC_VER) #include -#define MAKE_TEMP_FILE_NAME _mktemp +#define TMP_PATH "./" +void MakeTmpFilePath(char* tmplate) +{ + auto pathtemplate = _mktemp(tmplate); + ASSERT_NE(pathtemplate, nullptr); +} #endif using namespace ::Assimp; @@ -67,12 +77,9 @@ TEST_F( utDefaultIOStream, FileSizeTest ) { const auto dataSize = sizeof(data); const auto dataCount = dataSize / sizeof(*data); - char fpath[] = { "./rndfp.XXXXXX" }; - auto tmplate = MAKE_TEMP_FILE_NAME(fpath); - ASSERT_NE(tmplate, nullptr); + char fpath[] = { TMP_PATH"rndfp.XXXXXX" }; + MakeTmpFilePath(fpath); - //char buffer[ L_tmpnam ]; - //tmpnam( buffer ); auto *fs = std::fopen(fpath, "w+" ); ASSERT_NE(fs, nullptr); auto written = std::fwrite(data, sizeof(*data), dataCount, fs ); -- 2.7.4