claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some of the tests for MinGW and fix the use of Sleep/usleep for MinGW & MSVC platforms

Browse Source 
* Sleep takes ms, not s
* Use sleep/Sleep rather than usleep in the cdchange sample, as usleep
  is not available on recent MinGW platforms

From pbatard branch.
This commit is contained in:
R. Bernstein
2012-02-24 22:03:19 -05:00
parent 871eca6415
commit 734c6473b3
4 changed files with 45 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test/driver/mmc_read.c
View File

@@ -1,6 +1,6 @@
/* -*- C -*-
Copyright (C) 2009 Thomas Schmitt <scdbackup@gmx.net>
Copyright (C) 2010, 2011 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2010, 2011, 2012 Rocky Bernstein <rocky@gnu.org>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -36,7 +36,16 @@
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
#ifdef HAVE_STRING_H
#include <string.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#if !defined(HAVE_SLEEP) && defined(_WIN32)
#include <windows.h>
#define sleep(s) Sleep(1000*s)
#endif
#define SKIP_TEST 77

18
test/driver/mmc_write.c
View File

@@ -1,6 +1,6 @@
/* -*- C -*-
Copyright (C) 2009 Thomas Schmitt <scdbackup@gmx.net>
Copyright (C) 2010 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2010, 2012 Rocky Bernstein <rocky@gnu.org>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -28,15 +28,21 @@
#include <cdio/mmc_cmds.h>
#ifdef HAVE_STDIO_H
#include <stdio.h>
# include <stdio.h>
#endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
# include <sys/types.h>
#endif
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
# include <stdlib.h>
#endif
#ifdef HAVE_STRING_H
# include <string.h>
#endif
#if !defined(HAVE_SLEEP) && defined(_WIN32)
# include <windows.h>
# define sleep(s) Sleep(1000*s)
#endif
#include <string.h>
#define SKIP_TEST 77
@@ -518,7 +524,7 @@ test_rwr_mode_page(CdIo_t *p_cdio, unsigned int i_flag)
} else if (memcmp(buf, old_buf, i_size) != 0) {
fprintf(stderr,
"test_rwr_mode_page: Mode page was not restored to old state.\n");
final_return = -1;
final_return = final_return > 0 ? -1 : final_return;
}
if (i_flag & 1)
printf("test_rwr_mode_page: Mode page 2Ah restored to previous state\n");

10
test/driver/realpath.c
View File

@@ -47,6 +47,14 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#if defined(_WIN32) && !defined(__CYGWIN__)
#include <windows.h>
#include <direct.h> /* _mkdir */
/* MinGW, MSVC do not have symlink */
#define symlink(oldpath, newpath) CopyFileA(oldpath, newpath, FALSE)
#else
#define _mkdir(a) mkdir(a, S_IRWXU)
#endif
#ifdef HAVE_ERRNO_H
# include <errno.h>
@@ -102,7 +110,7 @@ main(int argc, const char *argv[])
exit(77);
}
if (-1 == check_rc(mkdir(psz_tmp_subdir, 0700),
if (-1 == check_rc(_mkdir(psz_tmp_subdir),
"mkdir", psz_tmp_subdir))
exit(77);