Skip to content

Commit

Permalink
tests/qtest: pflash-cfi02-test: Avoid using hardcoded /tmp
Browse files Browse the repository at this point in the history
This case was written to use hardcoded /tmp directory for temporary
files. Update to use g_file_open_tmp() for a portable implementation.

Signed-off-by: Bin Meng <bin.meng@windriver.com>
Message-Id: <20220927110632.1973965-16-bmeng.cn@gmail.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
  • Loading branch information
lbmeng authored and huth committed Sep 27, 2022
1 parent 52ca92d commit 8189b27
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions tests/qtest/pflash-cfi02-test.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ typedef struct {
QTestState *qtest;
} FlashConfig;

static char image_path[] = "/tmp/qtest.XXXXXX";
static char *image_path;

/*
* The pflash implementation allows some parameters to be unspecified. We want
Expand Down Expand Up @@ -608,6 +608,7 @@ static void test_cfi_in_autoselect(const void *opaque)
static void cleanup(void *opaque)
{
unlink(image_path);
g_free(image_path);
}

/*
Expand Down Expand Up @@ -635,16 +636,14 @@ static const FlashConfig configuration[] = {

int main(int argc, char **argv)
{
int fd = mkstemp(image_path);
if (fd == -1) {
g_printerr("Failed to create temporary file %s: %s\n", image_path,
strerror(errno));
exit(EXIT_FAILURE);
}
GError *err = NULL;
int fd = g_file_open_tmp("qtest.XXXXXX", &image_path, &err);
g_assert_no_error(err);

if (ftruncate(fd, UNIFORM_FLASH_SIZE) < 0) {
int error_code = errno;
close(fd);
unlink(image_path);
cleanup(NULL);
g_printerr("Failed to truncate file %s to %u MB: %s\n", image_path,
UNIFORM_FLASH_SIZE, strerror(error_code));
exit(EXIT_FAILURE);
Expand Down

0 comments on commit 8189b27

Please sign in to comment.