Skip to content

Work-around error with stderr buffer file creation on Windows #64

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
cher-nov wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Work-around error with stderr buffer file creation on Windows #64

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe19d1f
Fix some typos
cher-nov Sep 24, 2020
5f59b4a
Work-around error with stderr buffer file creation on Windows
cher-nov Sep 26, 2020
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
54 changes: 44 additions & 10 deletions munit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ static MUNIT_THREAD_LOCAL jmp_buf munit_error_jmp_buf;
#endif

/* At certain warning levels, mingw will trigger warnings about
* suggesting the format attribute, which we've explicity *not* set
* suggesting the format attribute, which we've explicitly *not* set
* because it will then choke on our attempts to use the MS-specific
* I64 modifier for size_t (which we have to use since MSVC doesn't
* support the C99 z modifier). */
Expand Down Expand Up @@ -298,7 +298,7 @@ munit_malloc_ex(const char* filename, int line, size_t size) {
* sync. */

/* Clocks (v1)
* Portable Snippets - https://gitub.com/nemequ/portable-snippets
* Portable Snippets - https://github.com/nemequ/portable-snippets
* Created by Evan Nemerson <evan@nemerson.com>
*
* To the extent possible under law, the authors have waived all
Expand Down Expand Up @@ -1072,7 +1072,7 @@ munit_print_time(FILE* fp, munit_uint64_t nanoseconds) {
}
#endif

/* Add a paramter to an array of parameters. */
/* Add a parameter to an array of parameters. */
static MunitResult
munit_parameters_add(size_t* params_size, MunitParameter* params[MUNIT_ARRAY_PARAM(*params_size)], char* name, char* value) {
*params = realloc(*params, sizeof(MunitParameter) * (*params_size + 2));
Expand Down Expand Up @@ -1119,7 +1119,7 @@ munit_maybe_concat(size_t* len, char* prefix, char* suffix) {
return res;
}

/* Possbily free a string returned by munit_maybe_concat. */
/* Possibly free a string returned by munit_maybe_concat. */
static void
munit_maybe_free_concat(char* s, const char* prefix, const char* suffix) {
if (prefix != s && suffix != s)
Expand Down Expand Up @@ -1279,6 +1279,33 @@ munit_restore_stderr(int orig_stderr) {
}
#endif /* !defined(MUNIT_NO_BUFFER) */

static FILE*
munit_create_local_tempfile(char* buf_filename) {
FILE* result;

do {
if (tmpnam(buf_filename) == NULL) {
buf_filename[0] = '\0';
return NULL;
}

#if defined(_WIN32)
/* Under Windows, tmpnam may generate a filename starting with backslash.
* https://stackoverflow.com/questions/38868858/fopen-of-file-name-created-by-tmpnam-fails-on-mingw
* We don't create the folders, so trying to fix only this edge case.
* To avoid changes to the filename tested by tmpnam, memmove is used. */
if (buf_filename[0] == '\\')
memmove(buf_filename, buf_filename+1, L_tmpnam-1);
#endif

/* Someone who uses the same tmpnam algorithm may create the file between
* calls to tmpnam and fopen here, so we need this additional check. */
result = fopen(buf_filename, "wb+");
} while (result == NULL);

return result;
}

/* Run a test with the specified parameters. */
static void
munit_test_runner_run_test_with_params(MunitTestRunner* runner, const MunitTest* test, const MunitParameter params[]) {
Expand All @@ -1292,7 +1319,8 @@ munit_test_runner_run_test_with_params(MunitTestRunner* runner, const MunitTest*
unsigned int output_l;
munit_bool first;
const MunitParameter* param;
FILE* stderr_buf;
FILE* stderr_buf = NULL;
char local_tmpfn[L_tmpnam] = { 0, };
#if !defined(MUNIT_NO_FORK)
int pipefd[2];
pid_t fork_pid;
Expand Down Expand Up @@ -1326,16 +1354,20 @@ munit_test_runner_run_test_with_params(MunitTestRunner* runner, const MunitTest*

fflush(MUNIT_OUTPUT_FILE);

stderr_buf = NULL;
#if !defined(_WIN32) || defined(__MINGW32__)
stderr_buf = tmpfile();
#else
tmpfile_s(&stderr_buf);
#endif
if (stderr_buf == NULL) {
munit_log_errno(MUNIT_LOG_ERROR, stderr, "unable to create buffer for stderr");
result = MUNIT_ERROR;
goto print_result;
/* On some systems (e.g. Windows), tmpfile may require elevated privileges. */
stderr_buf = munit_create_local_tempfile(local_tmpfn);

if (stderr_buf == NULL) {
munit_log_errno(MUNIT_LOG_ERROR, stderr, "unable to create buffer for stderr");
result = MUNIT_ERROR;
goto print_result;
}
}

#if !defined(MUNIT_NO_FORK)
Expand Down Expand Up @@ -1513,6 +1545,8 @@ munit_test_runner_run_test_with_params(MunitTestRunner* runner, const MunitTest*
}

fclose(stderr_buf);
if (local_tmpfn[0] != '\0')
remove(local_tmpfn);
}
}

Expand Down Expand Up @@ -1650,7 +1684,7 @@ munit_test_runner_run_test(MunitTestRunner* runner,
}

/* Recurse through the suite and run all the tests. If a list of
* tests to run was provied on the command line, run only those
* tests to run was provided on the command line, run only those
* tests. */
static void
munit_test_runner_run_suite(MunitTestRunner* runner,
Expand Down