summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@gmail.com>2012-12-11 15:47:16 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2012-12-12 10:02:58 +0100
commitba8d345a25def35f63f3626f519969b8295a84ec (patch)
tree5d9bd3feeb755f08f66a9c845d5cb17617e8d3ca /tests
parent57012088f8296c6c8e9b8005a3ec4907438f99cd (diff)
downloadmsitools-ba8d345a25def35f63f3626f519969b8295a84ec.tar.gz
msitools-ba8d345a25def35f63f3626f519969b8295a84ec.tar.xz
msitools-ba8d345a25def35f63f3626f519969b8295a84ec.zip
testrecord: use glib mkstemp
Diffstat (limited to 'tests')
-rw-r--r--tests/testrecord.c33
1 files changed, 11 insertions, 22 deletions
diff --git a/tests/testrecord.c b/tests/testrecord.c
index ec8d34f..9977912 100644
--- a/tests/testrecord.c
+++ b/tests/testrecord.c
@@ -31,30 +31,21 @@
static const char *msifile = "winetest-record.msi";
-static bool create_temp_file(char *name)
+static bool create_temp_file (char *name)
{
- unsigned r;
unsigned char buffer[26], i;
- unsigned sz;
int fd;
-#ifdef _WIN32
- r = GetTempFileName(".", "msitest",0,name);
- if(!r)
- return r;
- fd = open(name, O_WRONLY);
-#else
- strcpy(name, "msitext-XXXXXX.tmp");
- fd = mkstemp(name);
-#endif
+ strcpy (name, "msitext-XXXXXX.tmp");
+ fd = g_mkstemp (name);
+ g_return_val_if_fail (fd != -1, FALSE);
+
+ for (i = 0; i < 26; i++)
+ buffer[i] = i + 'a';
+ write (fd, buffer, sizeof (buffer));
+ close (fd);
- if(fd == -1)
- return false;
- for(i=0; i<26; i++)
- buffer[i]=i+'a';
- write(fd, buffer, sizeof(buffer));
- close(fd);
- return true;
+ return TRUE;
}
static void test_msirecord(void)
@@ -277,9 +268,7 @@ static void test_msirecord(void)
g_object_unref(h);
/* now try streams in a new record - need to create a file to play with */
- r = create_temp_file(filename);
- if(!r)
- return;
+ g_assert (create_temp_file(filename));
/* streams can't be inserted in field 0 for some reason */
h = libmsi_record_new(2);