v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replaced flakey macros with specific functions to serve the purpose

pull/1457/head
Jared Mulconry 2017-09-25 22:58:47 +10:00
parent f6fc5a7a11
commit 4360267cb2
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
test/unit/utDefaultIOStream.cpp
View File

@ -44,10 +44,20 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <string>
#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 <io.h>
#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 );