diff options
| author | rocky <rocky@gnu.org> | 2012-09-27 06:27:46 -0400 |
|---|---|---|
| committer | rocky <rocky@gnu.org> | 2012-09-27 06:29:07 -0400 |
| commit | 3f0ad681bde2f4e59f461ee90ddb0bbe5784370a (patch) | |
| tree | cde6930ac56303028e471e2f2db4ef8ed7a60357 | |
| parent | 66a42ea601b7e2c1ae0c574111cd2bb7aaed3a1c (diff) | |
Add native_top_srcdir MinGW and DOS/Windows.
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | test/testisocd2.c.in | 4 | ||||
| -rw-r--r-- | test/testpregap.c.in | 16 |
3 files changed, 17 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 32c51f62..27502403 100644 --- a/configure.ac +++ b/configure.ac @@ -332,6 +332,11 @@ AC_SUBST(SED_EXTENDED_RE_FLAG) dnl Libtool flag for strict linkage LT_NO_UNDEFINED= +dnl regression tests need native-style absolute paths. +dnl native_srcdir is used here. +native_top_srcdir=$(cd $srcdir; /bin/bash.exe -c 'builtin pwd -W') +AC_SUBST(native_top_srcdir) + case $host_os in aix*) ## Don't use AIX driver until starts to really work @@ -409,8 +414,8 @@ int has_timeout=sizeof(test.timeout);], ;; mingw*) # regression tests need native-style absolute paths. - # $srcdir is used to build top_abs_srcdir. - srcdir=$(cd $srcdir; /bin/bash.exe -c 'builtin pwd -W') + # $native_srcdir is used here. + native_top_srcdir=$(cd $srcdir; /bin/bash.exe -c 'builtin pwd -W') AC_CHECK_HEADERS(windows.h) AC_DEFINE([MINGW32], [1], diff --git a/test/testisocd2.c.in b/test/testisocd2.c.in index 9b2645cb..f699f3d6 100644 --- a/test/testisocd2.c.in +++ b/test/testisocd2.c.in @@ -1,5 +1,5 @@ /* - Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2012 Rocky Bernstein + Copyright (C) 2003-2008, 2012 Rocky Bernstein <rocky@gnu.org> This program is free software: you can redistribute it and/or modify @@ -48,7 +48,7 @@ #include "filemode.h" /* Set up a CD-DA image to test on which is in the libcdio distribution. */ -#define ISO9660_IMAGE_PATH "@abs_top_srcdir@/test/data/" +#define ISO9660_IMAGE_PATH "@native_top_srcdir@/test/data/" #define ISO9660_IMAGE ISO9660_IMAGE_PATH "copying.iso" #define SKIP_TEST_RC 77 diff --git a/test/testpregap.c.in b/test/testpregap.c.in index b128a7df..1c71b0f4 100644 --- a/test/testpregap.c.in +++ b/test/testpregap.c.in @@ -1,5 +1,5 @@ /* - Copyright (C) 2003, 2004, 2005, 2011 Rocky Bernstein <rocky@gnu.org> + Copyright (C) 2003-2005, 2011-2012 Rocky Bernstein <rocky@gnu.org> Copyright (C) 2008 Robert W. Fuller <hydrologiccycle@gmail.com> This program is free software: you can redistribute it and/or modify @@ -67,14 +67,14 @@ typedef struct _pregap_list_t { static pregap_list_t pregapList[] = { - { "@abs_top_srcdir@/test/data/t2.toc", 1, 4425 }, - { "@abs_top_srcdir@/test/data/t2.toc", 2, CDIO_INVALID_LSN }, - { "@abs_top_srcdir@/test/data/p1.cue", 1, 0 }, - { "@abs_top_srcdir@/test/data/p1.cue", 2, 150 }, - { "@abs_top_srcdir@/test/data/p1.cue", 3, CDIO_INVALID_LSN }, + { "@native_top_srcdir@/test/data/t2.toc", 1, 4425 }, + { "@native_top_srcdir@/test/data/t2.toc", 2, CDIO_INVALID_LSN }, + { "@native_top_srcdir@/test/data/p1.cue", 1, 0 }, + { "@native_top_srcdir@/test/data/p1.cue", 2, 150 }, + { "@native_top_srcdir@/test/data/p1.cue", 3, CDIO_INVALID_LSN }, /* { "p1.nrg", 1, 0 }, Nero did not create the proper pre-gap - bleh */ - { "@abs_top_srcdir@/test/data/p1.nrg", 2, 225 }, - { "@abs_top_srcdir@/test/data/p1.nrg", 3, CDIO_INVALID_LSN } + { "@native_top_srcdir@/test/data/p1.nrg", 2, 225 }, + { "@native_top_srcdir@/test/data/p1.nrg", 3, CDIO_INVALID_LSN } }; #define NELEMS(v) (sizeof(v) / sizeof(v[0])) |