diff options
| author | kientzle <kientzle@FreeBSD.org> | 2009-03-05 00:31:48 +0000 |
|---|---|---|
| committer | kientzle <kientzle@FreeBSD.org> | 2009-03-05 00:31:48 +0000 |
| commit | 1d35cb198bc3dfc1324b7176dd015d2d4f577534 (patch) | |
| tree | 20b0b85b2df81bdc3a0991bd065c608192a888fe /lib/libarchive/test/main.c | |
| parent | 1a8d7ef92049f314a651a656e316df16cd8f7946 (diff) | |
| download | FreeBSD-src-1d35cb198bc3dfc1324b7176dd015d2d4f577534.zip FreeBSD-src-1d35cb198bc3dfc1324b7176dd015d2d4f577534.tar.gz | |
Merge r341,r345,r346,347 from libarchive.googlecode.com: Style
fixes to test harness and a few extra guards to detect tests
that can't succeed on certain platforms.
Diffstat (limited to 'lib/libarchive/test/main.c')
| -rw-r--r-- | lib/libarchive/test/main.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/libarchive/test/main.c b/lib/libarchive/test/main.c index 24ea6c7..6322f6f 100644 --- a/lib/libarchive/test/main.c +++ b/lib/libarchive/test/main.c @@ -33,6 +33,9 @@ #include <locale.h> #include <stdarg.h> #include <time.h> +#ifdef _WIN32 +#include <crtdbg.h> +#endif /* * This same file is used pretty much verbatim for all test harnesses. @@ -907,6 +910,10 @@ get_refdir(void) strncat(tried, "\n", sizeof(tried) - strlen(tried) - 1); } + /* You should have to add "$(TargetDir)" to + * Properties > Configuration Properties > Debugging > Working Directory, + * if you are running libarchive_test.exe on Visual Studio. + */ printf("Unable to locate known reference file %s\n", KNOWNREF); printf(" Checked following directories:\n%s\n", tried); exit(1); @@ -966,7 +973,7 @@ int main(int argc, char **argv) * Parse options, without using getopt(), which isn't available * on all platforms. */ - ++argv; /* Skip program name */ + ++argv; --argc;/* Skip program name */ while (*argv != NULL) { p = *argv++; if (*p++ != '-') |
