Convert remaining tests to new framework.
--HG--
branch : HEAD
diff --git a/regress/Makefile.am b/regress/Makefile.am
index 87cec28..dcc573c 100644
--- a/regress/Makefile.am
+++ b/regress/Makefile.am
@@ -16,12 +16,14 @@
deltest_SOURCES= deltest.c
ziptest_SOURCES= ziptest.c
-TESTS=open name_locate fread
TESTS_ENVIRONMENT= SRCDIR=${srcdir}
TESTCASES= \
add_from_file.test \
- add_from_buffer.test
+ add_from_buffer.test \
+ fread.test \
+ name_locate.test \
+ open.test
check:
@failed=0; all=0; \
diff --git a/regress/fread.c b/regress/fread.c
index a23d45b..5581c69 100644
--- a/regress/fread.c
+++ b/regress/fread.c
@@ -1,5 +1,5 @@
/*
- $NiH: fread.c,v 1.3 2005/01/20 21:01:41 dillo Exp $
+ $NiH: fread.c,v 1.4 2005/06/09 18:49:38 dillo Exp $
fread.c -- test cases for reading from zip archives
Copyright (C) 2004, 2005 Dieter Baron and Thomas Klausner
@@ -42,8 +42,6 @@
#include "zip.h"
#include "mkname.h"
-#define TEST_ZIP "broken.zip"
-
enum when {
WHEN_NEVER, WHEN_OPEN, WHEN_READ, WHEN_CLOSE
};
@@ -56,18 +54,30 @@
+const char *prg;
+
int
main(int argc, char *argv[])
{
int fail, ze;
struct zip *z;
struct zip_source *zs;
+ char *archive;
fail = 0;
- if ((z=zip_open(mkname(TEST_ZIP), 0, &ze)) == NULL) {
- printf("fail: opening zip archive ``%s'' failed (%d)\n",
- TEST_ZIP, ze);
+ prg = argv[0];
+
+ if (argc != 2) {
+ fprintf(stderr, "usage: %s archive\n", prg);
+ return 1;
+ }
+
+ archive = argv[1];
+
+ if ((z=zip_open(mkname(archive), 0, &ze)) == NULL) {
+ printf("%s: opening zip archive ``%s'' failed (%d)\n", prg,
+ archive, ze);
return 1;
}
@@ -138,7 +148,7 @@
if (when_got != when_ex || ze_got != ze_ex || se_got != se_ex) {
zip_error_to_str(expected, sizeof(expected), ze_ex, se_ex);
zip_error_to_str(got, sizeof(got), ze_got, se_got);
- printf("got %s error (%s), expected %s error (%s)\n",
+ printf("%s: got %s error (%s), expected %s error (%s)\n", prg,
when_name[when_got], got,
when_name[when_ex], expected);
return 1;
diff --git a/regress/fread.test b/regress/fread.test
new file mode 100644
index 0000000..c1c7888
--- /dev/null
+++ b/regress/fread.test
@@ -0,0 +1,6 @@
+# various tests for zip_fread
+# $NiH$
+program fread
+args broken.zip
+return 0
+copy broken.zip broken.zip
diff --git a/regress/name_locate.c b/regress/name_locate.c
index 11179fd..7fe0061 100644
--- a/regress/name_locate.c
+++ b/regress/name_locate.c
@@ -1,5 +1,5 @@
/*
- $NiH: name_locate.c,v 1.3 2005/06/03 12:29:44 wiz Exp $
+ $NiH: name_locate.c,v 1.4 2005/06/09 18:49:38 dillo Exp $
name_locate.c -- test cases for finding files in zip archives
Copyright (C) 2005 Dieter Baron and Thomas Klausner
@@ -42,11 +42,11 @@
#include "zip.h"
#include "mkname.h"
-#define TEST_ZIP "test.zip"
-
int find_fail(struct zip *, const char *, int, int);
int find_success(struct zip *, const char *, int);
+const char *prg;
+
int
@@ -54,12 +54,21 @@
{
int fail, ze;
struct zip *z;
+ const char *archive;
fail = 0;
+ prg = argv[0];
- if ((z=zip_open(mkname(TEST_ZIP), 0, &ze)) == NULL) {
- printf("fail: opening zip archive ``%s'' failed (%d)\n",
- TEST_ZIP, ze);
+ if (argc != 2) {
+ fprintf(stderr, "usage: %s archive\n", prg);
+ return 1;
+ }
+
+ archive = argv[1];
+
+ if ((z=zip_open(mkname(archive), 0, &ze)) == NULL) {
+ printf("%s: opening zip archive ``%s'' failed (%d)\n", prg,
+ archive, ze);
return 1;
}
@@ -96,9 +105,9 @@
zip_error_get(z, &ze, &se);
if (ze != zerr) {
zip_error_to_str(expected, sizeof(expected), zerr, 0);
- printf("unexpected error while looking for ``%s'': "
- "got ``%s'', expected ``%s''\n", name, zip_strerror(z),
- expected);
+ printf("%s: unexpected error while looking for ``%s'': "
+ "got ``%s'', prg, expected ``%s''\n", name,
+ zip_strerror(z), expected);
return 1;
}
@@ -115,8 +124,8 @@
{
if (zip_name_locate(z, name, flags) < 0) {
- printf("unexpected error while looking for ``%s'': %s\n",
- name, zip_strerror(z));
+ printf("%s: unexpected error while looking for ``%s'': %s\n",
+ prg, name, zip_strerror(z));
return 1;
}
diff --git a/regress/name_locate.test b/regress/name_locate.test
new file mode 100644
index 0000000..c4e77a4
--- /dev/null
+++ b/regress/name_locate.test
@@ -0,0 +1,6 @@
+# various tests for zip_name_locate
+# $NiH$
+program name_locate
+args test.zip
+return 0
+copy test.zip test.zip
diff --git a/regress/open.c b/regress/open.c
index 236b23a..1516f1c 100644
--- a/regress/open.c
+++ b/regress/open.c
@@ -1,5 +1,5 @@
/*
- $NiH: open.c,v 1.4 2005/01/11 18:53:16 wiz Exp $
+ $NiH: open.c,v 1.5 2005/06/09 18:49:38 dillo Exp $
open.c -- test cases for opening zip archives
Copyright (C) 1999, 2003, 2005 Dieter Baron and Thomas Klausner
@@ -45,25 +45,37 @@
int open_fail(const char *, int, const char *, int, int);
int open_success(const char *, int, const char *, int);
+const char *prg;
int
main(int argc, char *argv[])
{
int fail;
+ const char *archive;
+ const char *nonarchive;
fail = 0;
+ prg = argv[0];
+
+ if (argc != 3) {
+ fprintf(stderr, "usage: %s archive non-archive\n", prg);
+ return 1;
+ }
+
+ archive = argv[1];
+ nonarchive = argv[2];
remove("nosuchfile");
fail += open_fail("nosuchfile", 0, "non-existing", ZIP_ER_OPEN, ENOENT);
- fail += open_fail("Makefile.am", 0, "non-zip", ZIP_ER_NOZIP, 0);
- fail += open_fail("test.zip", ZIP_EXCL, "existing-excl", ZIP_ER_EXISTS, 0);
+ fail += open_fail(nonarchive, 0, "non-zip", ZIP_ER_NOZIP, 0);
+ fail += open_fail(archive, ZIP_EXCL, "existing-excl", ZIP_ER_EXISTS, 0);
/* ZIP_ER_OPEN */
/* ZIP_ER_READ */
/* ZIP_ER_SEEK */
/* ZIP_ER_INCONS */
- fail += open_success("test.zip", 0, "existing", 3);
+ fail += open_success(archive, 0, "existing", 3);
fail += open_success("nosuchfile", ZIP_CREATE, "new", 0);
exit(fail ? 1 : 0);
@@ -80,13 +92,13 @@
errno = 0;
if ((z=zip_open(mkname(fname), flags, &ze)) != NULL) {
- printf("fail: opening %s succeeded\n", desc);
+ printf("%s: opening %s succeeded\n", prg, desc);
zip_close(z);
return 1;
}
else if (ze != zerr || errno != serr) {
- printf("fail: opening %s returned wrong error %d/%d, expected %d/%d\n",
- desc, ze, errno, zerr, serr);
+ printf("%s: opening %s returned wrong error %d/%d, expected %d/%d\n",
+ prg, desc, ze, errno, zerr, serr);
return 1;
}
@@ -102,7 +114,7 @@
int ze, num;
if ((z=zip_open(mkname(fname), flags, &ze)) == NULL) {
- printf("fail: opening %s failed (%d)\n", desc, ze);
+ printf("%s: opening %s failed (%d)\n", prg, desc, ze);
return 1;
}
@@ -110,8 +122,8 @@
zip_close(z);
if (num != nent) {
- printf("fail: opening %s got wrong number of files %d, expected %d\n",
- desc, num, nent);
+ printf("%s: opening %s got wrong number of files %d, expected %d\n",
+ prg, desc, num, nent);
return 1;
}
diff --git a/regress/open.test b/regress/open.test
new file mode 100644
index 0000000..84d0fa1
--- /dev/null
+++ b/regress/open.test
@@ -0,0 +1,7 @@
+# various tests for zip_open
+# $NiH$
+program open
+args test.zip Makefile.am
+return 0
+copy test.zip test.zip
+copy Makefile.am Makefile.am
