Radish alpha
H
HardenedBSD-pkg
HardenedBSD Package Manager
Radicle
Git (anonymous pull)
Log in to clone via SSH
Commits ›
Fix tests compilation.
jlaffaye committed 15 years ago
commit dbcf55729b46dfd7b776db553afddc7233f88014
parent f0d8413e02c916456f43e8cc587e109201cbc893
1 file changed +17 -17
modified tests/pkg.c
@@ -6,9 +6,9 @@ START_TEST(pkg_null)
	struct pkg *p = NULL;



	fail_unless(pkg_get(p, PKG_NAME) ==NULL);
- 
	fail_unless(pkg_set(p, PKG_NAME, "foobar") == EPKG_NULL_PKG);
+ 
	fail_unless(pkg_set(p, PKG_NAME, "foobar") == EPKG_FATAL);

	fail_unless(pkg_type(p) == PKG_NONE);
- 
	fail_unless(pkg_set_from_file(p, PKG_NAME, "path") == EPKG_NULL_PKG);
+ 
	fail_unless(pkg_set_from_file(p, PKG_NAME, "path") == EPKG_FATAL);

	fail_unless(pkg_scripts(p) == NULL);

	fail_unless(pkg_deps(p) == NULL);

	fail_unless(pkg_execs(p) == NULL);
@@ -16,23 +16,23 @@ START_TEST(pkg_null)
	fail_unless(pkg_rdeps(p) == NULL);

	fail_unless(pkg_files(p) == NULL);

	fail_unless(pkg_conflicts(p) == NULL);
- 
	fail_unless(pkg_addscript(p, "./bla") == EPKG_NULL_PKG);
- 
	fail_unless(pkg_addoption(p, "foo", "bar") == EPKG_NULL_PKG);
- 
	fail_unless(pkg_addexec(p, "bal", PKG_EXEC) == EPKG_NULL_PKG);
- 
	fail_unless(pkg_adddep(p, "foo", "foo/bar", "123") == EPKG_NULL_PKG);
+ 
	fail_unless(pkg_addscript(p, "./bla") == EPKG_FATAL);
+ 
	fail_unless(pkg_addoption(p, "foo", "bar") == EPKG_FATAL);
+ 
	fail_unless(pkg_addexec(p, "bal", PKG_EXEC) == EPKG_FATAL);
+ 
	fail_unless(pkg_adddep(p, "foo", "foo/bar", "123") == EPKG_FATAL);



	fail_unless(pkg_new(&p) == EPKG_OK);
- 
	fail_unless(pkg_set(p, PKG_NAME, NULL) == EPKG_NULL_VALUE);
- 
	fail_unless(pkg_set_from_file(p, PKG_NAME, NULL) == EPKG_NULL_VALUE);
- 
	fail_unless(pkg_open(NULL, &p, 0) == EPKG_NULL_VALUE);
- 
	fail_unless(pkg_open("test", &p, 0) == EPKG_ERROR_ARCHIVE);
- 
	fail_unless(pkg_addscript(p, NULL) == EPKG_NULL_VALUE);
- 
	fail_unless(pkg_addscript(p, "./bla") == EPKG_ERROR_OPEN);
- 
	fail_unless(pkg_addoption(p, NULL, "bar") == EPKG_NULL_VALUE);
- 
	fail_unless(pkg_addoption(p, "foo", NULL) == EPKG_NULL_VALUE);
- 
	fail_unless(pkg_addexec(p, NULL, PKG_EXEC) == EPKG_NULL_VALUE);
- 
	fail_unless(pkg_adddep(p, NULL, "foo/bar", "123") == EPKG_NULL_VALUE);
- 
	fail_unless(pkg_adddep(p, "foo", NULL, "123") == EPKG_NULL_VALUE);
+ 
	fail_unless(pkg_set(p, PKG_NAME, NULL) == EPKG_FATAL);
+ 
	fail_unless(pkg_set_from_file(p, PKG_NAME, NULL) == EPKG_FATAL);
+ 
	fail_unless(pkg_open(NULL, &p, 0) == EPKG_FATAL);
+ 
	fail_unless(pkg_open("test", &p, 0) == EPKG_FATAL);
+ 
	fail_unless(pkg_addscript(p, NULL) == EPKG_FATAL);
+ 
	fail_unless(pkg_addscript(p, "./bla") == EPKG_FATAL);
+ 
	fail_unless(pkg_addoption(p, NULL, "bar") == EPKG_FATAL);
+ 
	fail_unless(pkg_addoption(p, "foo", NULL) == EPKG_FATAL);
+ 
	fail_unless(pkg_addexec(p, NULL, PKG_EXEC) == EPKG_FATAL);
+ 
	fail_unless(pkg_adddep(p, NULL, "foo/bar", "123") == EPKG_FATAL);
+ 
	fail_unless(pkg_adddep(p, "foo", NULL, "123") == EPKG_FATAL);

	/* currently disabled until we get code to test origin format and name

	 * format*/

/*	fail_unless(pkg_adddep(p, "foo", "foobar", NULL) == EPKG_NOT_ORIGIN);