Skip to content

Commit 48804dc

Browse files
committed
Merge GitHub PR Hamlib#1819
2 parents 66acf19 + c0ec84c commit 48804dc

2 files changed

Lines changed: 11 additions & 1 deletion

File tree

bindings/Makefile.am

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,15 @@ SWGDEP = \
2222

2323
EXTRA_DIST = $(SWGFILES) \
2424
Makefile.PL perltest.pl tcltest.tcl.in \
25+
python/conftest.py \
2526
python/generate_tests.py \
2627
python/test_Hamlib_Amp_class.py \
27-
python/test_Hamlib_class.py \
2828
python/test_Hamlib_Rig_class.py \
2929
python/test_Hamlib_Rot_class.py \
30+
python/test_Hamlib_class.py \
31+
python/test_amp.py \
32+
python/test_rig.py \
33+
python/test_rot.py \
3034
python/test_startup.py \
3135
luatest.lua README.python
3236

bindings/python/conftest.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@ def pytest_addoption(parser):
2020
metavar='ID', help='select rotator model number')
2121
parser.addoption('--rot-file', default=None,
2222
metavar='DEVICE', help='set device of the rotator to operate on')
23+
else:
24+
# fallbacks for invocations through a Makefile
25+
parser.addoption('--model', type=int, default=1)
26+
parser.addoption('--amp-file', default=None)
27+
parser.addoption('--rig-file', default=None)
28+
parser.addoption('--rot-file', default=None)
2329
parser.addoption('--serial-speed', type=int, default=0,
2430
metavar='BAUD', help='set serial speed of the serial port')
2531
parser.addoption('--hamlib-verbose', action='count', default=0,

0 commit comments

Comments
 (0)