Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › e04d9e6
test: use ATF_TC_WITHOUT_HEAD to simplify code for tests
Baptiste Daroussin committed 3 years ago
commit e04d9e64aebe32d9b892429470b7e55a283c809b
parent 6dacb31
13 files changed +36 -110
modified tests/lib/checksum.c
@@ -29,18 +29,10 @@
#include <pkg.h>

#include <private/pkg.h>
- 
ATF_TC(check_symlinks);
- 
ATF_TC(check_pkg);
- 
ATF_TC(check_types);
- 
ATF_TC(check_validity);
-
- 
ATF_TC_HEAD(check_symlinks, tc)
- 
{
- 
	atf_tc_set_md_var(tc, "descr", "testing checksums on symlinks");
- 
}
- 
ATF_TC_HEAD(check_pkg, tc) {}
- 
ATF_TC_HEAD(check_types, tc) {}
- 
ATF_TC_HEAD(check_validity, tc) {}
+ 
ATF_TC_WITHOUT_HEAD(check_symlinks);
+ 
ATF_TC_WITHOUT_HEAD(check_pkg);
+ 
ATF_TC_WITHOUT_HEAD(check_types);
+ 
ATF_TC_WITHOUT_HEAD(check_validity);



ATF_TC_BODY(check_validity, tc)

{
modified tests/lib/deps_formula.c
@@ -30,14 +30,9 @@
#include <private/pkg.h>

#include <private/pkg_deps.h>
- 
ATF_TC(check_parsing);
- 
ATF_TC(check_sql);
- 
ATF_TC(check_op_parsing);
-
- 
ATF_TC_HEAD(check_parsing, tc)
- 
{
- 
	atf_tc_set_md_var(tc, "descr", "testing parsing of deps formula");
- 
}
+ 
ATF_TC_WITHOUT_HEAD(check_parsing);
+ 
ATF_TC_WITHOUT_HEAD(check_sql);
+ 
ATF_TC_WITHOUT_HEAD(check_op_parsing);



ATF_TC_BODY(check_parsing, tc)

{
modified tests/lib/lua.c
@@ -33,21 +33,13 @@
#include <fcntl.h>

#include <stdlib.h>
- 
ATF_TC(readdir);
- 
ATF_TC(stat);
- 
ATF_TC(print_msg);
- 
ATF_TC(execute);
- 
ATF_TC(override);
- 
ATF_TC(fileops);
- 
ATF_TC(prefix_path);
-
- 
ATF_TC_HEAD(readdir, tc) { }
- 
ATF_TC_HEAD(stat, tc) {}
- 
ATF_TC_HEAD(print_msg, tc) {}
- 
ATF_TC_HEAD(execute, tc) {}
- 
ATF_TC_HEAD(override, tc) {}
- 
ATF_TC_HEAD(fileops, tc) {}
- 
ATF_TC_HEAD(prefix_path, tc) {}
+ 
ATF_TC_WITHOUT_HEAD(readdir);
+ 
ATF_TC_WITHOUT_HEAD(stat);
+ 
ATF_TC_WITHOUT_HEAD(print_msg);
+ 
ATF_TC_WITHOUT_HEAD(execute);
+ 
ATF_TC_WITHOUT_HEAD(override);
+ 
ATF_TC_WITHOUT_HEAD(fileops);
+ 
ATF_TC_WITHOUT_HEAD(prefix_path);



ATF_TC_BODY(readdir, tc)

{
modified tests/lib/merge.c
@@ -28,13 +28,7 @@
#include <sys/types.h>

#include <private/utils.h>
- 
ATF_TC(merge);
-
- 
ATF_TC_HEAD(merge, tc)
- 
{
- 
	atf_tc_set_md_var(tc, "descr",
- 
	    "3 way merge");
- 
}
+ 
ATF_TC_WITHOUT_HEAD(merge);



ATF_TC_BODY(merge, tc)

{
modified tests/lib/metalog.c
@@ -28,9 +28,7 @@
#include <private/pkg.h>

#include <pkg_config.h>
- 
ATF_TC(basics);
-
- 
ATF_TC_HEAD(basics, tc) {}
+ 
ATF_TC_WITHOUT_HEAD(basics);



ATF_TC_BODY(basics, tc) {

#ifdef HAVE_FFLAGSTOSTR
modified tests/lib/packing.c
@@ -30,15 +30,10 @@
#include <private/packing.h>

#include <pkg_config.h>
- 
ATF_TC(packing_format_from_string);
- 
ATF_TC(packing_format_to_string);
- 
ATF_TC(packing_format_is_valid);
- 
ATF_TC(packing_set_format);
-
- 
ATF_TC_HEAD(packing_format_from_string, tc) { }
- 
ATF_TC_HEAD(packing_format_to_string, tc) { }
- 
ATF_TC_HEAD(packing_format_is_valid, tc) { }
- 
ATF_TC_HEAD(packing_set_format, tc) {}
+ 
ATF_TC_WITHOUT_HEAD(packing_format_from_string);
+ 
ATF_TC_WITHOUT_HEAD(packing_format_to_string);
+ 
ATF_TC_WITHOUT_HEAD(packing_format_is_valid);
+ 
ATF_TC_WITHOUT_HEAD(packing_set_format);



ATF_TC_BODY(packing_format_from_string, tc)

{
modified tests/lib/pkg_add_dir_to_del.c
@@ -29,13 +29,7 @@
#include <private/pkg.h>

#include <tllist.h>
- 
ATF_TC(pkg_add_dir_to_del);
-
- 
ATF_TC_HEAD(pkg_add_dir_to_del, tc)
- 
{
- 
	atf_tc_set_md_var(tc, "descr",
- 
	    "pkg_add_dir_to_del()");
- 
}
+ 
ATF_TC_WITHOUT_HEAD(pkg_add_dir_to_del);



ATF_TC_BODY(pkg_add_dir_to_del, tc)

{
modified tests/lib/pkg_printf_test.c
@@ -31,12 +31,8 @@
#include <pkg.h>

#include <private/pkg_printf.h>
- 
ATF_TC(gen_format);
- 
ATF_TC_HEAD(gen_format, tc)
- 
{
- 
	atf_tc_set_md_var(tc, "descr",
- 
			  "Generate printf format code for final output");
- 
}
+ 
ATF_TC_WITHOUT_HEAD(gen_format);
+ 


ATF_TC_BODY(gen_format, tc)

{

	char		 buf[32];
modified tests/lib/pkg_validation.c
@@ -42,13 +42,7 @@


xstring *msg;
- 
ATF_TC(valid_installed);
-
- 
ATF_TC_HEAD(valid_installed, tc)
- 
{
- 
	atf_tc_set_md_var(tc, "descr",
- 
	    "pkg_valid() tests installed packages");
- 
}
+ 
ATF_TC_WITHOUT_HEAD(valid_installed);



int

event_callback(void *data __unused, struct pkg_event *ev)
modified tests/lib/plist.c
@@ -28,13 +28,7 @@
#include <pkg.h>

#include <private/pkg.h>
- 
ATF_TC(parse_mode);
-
- 
ATF_TC_HEAD(parse_mode, tc)
- 
{
- 
	atf_tc_set_md_var(tc, "descr",
- 
	    "parse_mode()");
- 
}
+ 
ATF_TC_WITHOUT_HEAD(parse_mode);



ATF_TC_BODY(parse_mode, tc)

{
modified tests/lib/ssh.c
@@ -32,17 +32,11 @@
#include <stdlib.h>

#include <xmalloc.h>
- 
ATF_TC(badcommand);
- 
ATF_TC(badrestrict);
- 
ATF_TC(getfile);
- 
ATF_TC(notrestricted);
- 
ATF_TC(restricted);
-
- 
ATF_TC_HEAD(badcommand, tc) { }
- 
ATF_TC_HEAD(getfile, tc) { }
- 
ATF_TC_HEAD(badrestrict, tc) { }
- 
ATF_TC_HEAD(notrestricted, tc) { }
- 
ATF_TC_HEAD(restricted, tc) { }
+ 
ATF_TC_WITHOUT_HEAD(badcommand);
+ 
ATF_TC_WITHOUT_HEAD(badrestrict);
+ 
ATF_TC_WITHOUT_HEAD(getfile);
+ 
ATF_TC_WITHOUT_HEAD(notrestricted);
+ 
ATF_TC_WITHOUT_HEAD(restricted);



ATF_TC_BODY(badcommand, tc)

{
modified tests/lib/test.c
@@ -1,22 +1,14 @@
#include <atf-c.h>

#include "tests.h"
- 
ATF_TC(manifest);
- 
ATF_TC_HEAD(manifest, tc)
- 
{
- 
    atf_tc_set_md_var(tc, "descr", "Testing manifest loading...");
- 
}
+ 
ATF_TC_WITHOUT_HEAD(manifest);
+ 
ATF_TC_WITHOUT_HEAD(pkg);
+ 


ATF_TC_BODY(manifest, tc)

{

    test_manifest();

}
- 
ATF_TC(pkg);
- 
ATF_TC_HEAD(pkg, tc)
- 
{
- 
    atf_tc_set_md_var(tc, "descr", "Testing pkg interface...");
- 
}
- 


ATF_TC_BODY(pkg, tc)

{

    test_pkg();
modified tests/lib/utils.c
@@ -27,13 +27,9 @@
#include <err.h>

#include <private/utils.h>
- 
ATF_TC(hidden_tempfile);
- 
ATF_TC(random_suffix);
- 
ATF_TC(json_escape);
-
- 
ATF_TC_HEAD(hidden_tempfile, tc) {}
- 
ATF_TC_HEAD(random_suffix, tc) {}
- 
ATF_TC_HEAD(json_escape, tc) {}
+ 
ATF_TC_WITHOUT_HEAD(hidden_tempfile);
+ 
ATF_TC_WITHOUT_HEAD(random_suffix);
+ 
ATF_TC_WITHOUT_HEAD(json_escape);



ATF_TC_BODY(hidden_tempfile, tc) {

	const char *filename = "plop";