Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable tests #6128

Closed
wants to merge 4 commits into from
Closed

Enable tests #6128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7756c2b
Enable remaining tests
behlendorf May 19, 2017
2b005ae
Enable xattr tests
behlendorf May 19, 2017
a8487e9
Add zpool events tests
behlendorf May 18, 2017
68d6d59
Retire zconfig.sh
behlendorf May 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions TEST
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@
#TEST_ZTEST_DIR="/var/tmp/"
#TEST_ZTEST_OPTIONS="-V"

### zconfig
#TEST_ZCONFIG_SKIP="yes"
TEST_ZCONFIG_OPTIONS="-c -s10"

### zimport
#TEST_ZIMPORT_SKIP="yes"
#TEST_ZIMPORT_DIR="/var/tmp/zimport"
Expand Down
4 changes: 2 additions & 2 deletions cmd/zed/agents/zfs_mod.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,12 +763,12 @@ zfs_deliver_dle(nvlist_t *nvl)
char *devname;

if (nvlist_lookup_string(nvl, DEV_PHYS_PATH, &devname) != 0) {
zed_log_msg(LOG_INFO, "zfs_deliver_event: no physpath");
zed_log_msg(LOG_INFO, "zfs_deliver_dle: no physpath");
return (-1);
}

if (zpool_iter(g_zfshdl, zfsdle_vdev_online, devname) != 1) {
zed_log_msg(LOG_INFO, "zfs_deliver_event: device '%s' not "
zed_log_msg(LOG_INFO, "zfs_deliver_dle: device '%s' not "
"found", devname);
return (1);
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/zed/zed_disk_event.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ zed_udev_monitor(void *arg)
struct udev_monitor *mon = arg;
char *tmp, *tmp2;

zed_log_msg(LOG_INFO, "Waiting for new uduev disk events...");
zed_log_msg(LOG_INFO, "Waiting for new udev disk events...");

while (1) {
struct udev_device *dev;
Expand Down
2 changes: 2 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ AC_CONFIG_FILES([
tests/zfs-tests/cmd/threadsappend/Makefile
tests/zfs-tests/cmd/xattrtest/Makefile
tests/zfs-tests/include/Makefile
tests/zfs-tests/include/default.cfg
tests/zfs-tests/tests/Makefile
tests/zfs-tests/tests/functional/Makefile
tests/zfs-tests/tests/functional/acl/Makefile
Expand Down Expand Up @@ -234,6 +235,7 @@ AC_CONFIG_FILES([
tests/zfs-tests/tests/functional/ctime/Makefile
tests/zfs-tests/tests/functional/delegate/Makefile
tests/zfs-tests/tests/functional/devices/Makefile
tests/zfs-tests/tests/functional/events/Makefile
tests/zfs-tests/tests/functional/exec/Makefile
tests/zfs-tests/tests/functional/fault/Makefile
tests/zfs-tests/tests/functional/features/async_destroy/Makefile
Expand Down
1 change: 0 additions & 1 deletion scripts/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ EXTRA_DIST = dkms.mkconf dkms.postbuild kmodtool zfs2zol-patch.sed cstyle.pl
pkgdatadir = $(datadir)/@PACKAGE@
dist_pkgdata_SCRIPTS = \
$(top_builddir)/scripts/common.sh \
$(top_srcdir)/scripts/zconfig.sh \
$(top_srcdir)/scripts/zimport.sh \
$(top_srcdir)/scripts/zfs.sh \
$(top_srcdir)/scripts/zfs-tests.sh \
Expand Down
Loading