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

Minor cleanups for Debian packaging (lintian warnings and errors) #8803

Closed
wants to merge 2 commits into from
Closed

Minor cleanups for Debian packaging (lintian warnings and errors) #8803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f83d39
test-runner.py: change shebang to python3
May 23, 2019
e2390b7
tests: fix cosmetic permission issues during `make install`
May 23, 2019
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
2 changes: 1 addition & 1 deletion tests/test-runner/bin/test-runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python3
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit changes test-runner.py to also use /usr/bin/python3,
enabling the change during buildtime and fixing a minor lintian issue
on Debian systems, which only have python3 installed.

The highlighted part of the commit message seems to suggest (all) Debian systems don't provide python2. I tested this change on a Debian8 (Python 2.7.9) but the number of lintian warning/errors regarding test-runner.py seems to be the same as the unpatched version:

root@linux:~# lsb_release -a
No LSB modules are available.
Distributor ID:	Debian
Description:	Debian GNU/Linux 8.0 (jessie)
Release:	8.0
Codename:	jessie
root@linux:~# python -V
Python 2.7.9
root@linux:~# grep runner /var/tmp/patched /var/tmp/vanilla 
/var/tmp/patched:E: zfs-test: python-script-but-no-python-dep usr/share/zfs/test-runner/bin/test-runner.py
/var/tmp/patched:E: zfs-test: python-script-but-no-python-dep usr/share/zfs/test-runner/bin/zts-report.py
/var/tmp/vanilla:E: zfs-test: python-script-but-no-python-dep usr/share/zfs/test-runner/bin/test-runner.py
/var/tmp/vanilla:E: zfs-test: python-script-but-no-python-dep usr/share/zfs/test-runner/bin/zts-report.py
root@linux:~#

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the review and for catching the wrong phrasing of the commit message!
I just pushed a reworded version.

Additionally tested by building zfs while explicitly configuring for python2, and adapting the appropriate fields in the debian/control file - The lintian errors don't appear, and the shebang of test-runner.py is set to /usr/bin/python2


#
# This file and its contents are supplied under the terms of the
Expand Down
6 changes: 4 additions & 2 deletions tests/zfs-tests/tests/functional/alloc_class/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/alloc_class
dist_pkgdata_SCRIPTS = \
alloc_class.cfg \
alloc_class.kshlib \
setup.ksh \
cleanup.ksh \
alloc_class_001_pos.ksh \
Expand All @@ -17,3 +15,7 @@ dist_pkgdata_SCRIPTS = \
alloc_class_011_neg.ksh \
alloc_class_012_pos.ksh \
alloc_class_013_pos.ksh

dist_pkgdata_DATA = \
alloc_class.cfg \
alloc_class.kshlib
2 changes: 0 additions & 2 deletions tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import.kshlib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#!/bin/ksh

#
# This file and its contents are supplied under the terms of the
# Common Development and Distribution License ("CDDL"), version 1.0.
Expand Down
1 change: 0 additions & 1 deletion tests/zfs-tests/tests/functional/cli_root/zpool_initialize/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ dist_pkgdata_SCRIPTS = \
cleanup.ksh \
zpool_initialize_attach_detach_add_remove.ksh \
zpool_initialize_import_export.ksh \
zpool_initialize.kshlib \
zpool_initialize_offline_export_import_online.ksh \
zpool_initialize_online_offline.ksh \
zpool_initialize_split.ksh \
Expand Down
4 changes: 3 additions & 1 deletion tests/zfs-tests/tests/functional/cli_root/zpool_trim/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_trim
dist_pkgdata_SCRIPTS = \
setup.ksh \
cleanup.ksh \
zpool_trim.kshlib \
zpool_trim_attach_detach_add_remove.ksh \
zpool_trim_import_export.ksh \
zpool_trim_multiple.ksh \
Expand All @@ -20,3 +19,6 @@ dist_pkgdata_SCRIPTS = \
zpool_trim_unsupported_vdevs.ksh \
zpool_trim_verify_checksums.ksh \
zpool_trim_verify_trimmed.ksh

dist_pkgdata_DATA = \
zpool_trim.kshlib
5 changes: 4 additions & 1 deletion tests/zfs-tests/tests/functional/removal/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ dist_pkgdata_SCRIPTS = \
removal_with_send.ksh removal_with_send_recv.ksh \
removal_with_snapshot.ksh removal_with_write.ksh \
removal_with_zdb.ksh remove_mirror.ksh remove_mirror_sanity.ksh \
remove_raidz.ksh remove_expanded.ksh removal.kshlib
remove_raidz.ksh remove_expanded.ksh

dist_pkgdata_DATA = \
removal.kshlib

pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/removal
2 changes: 1 addition & 1 deletion tests/zfs-tests/tests/perf/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/perf
dist_pkgdata_SCRIPTS = \
dist_pkgdata_DATA = \
nfs-sample.cfg \
perf.shlib

Expand Down