diff --git a/tests/create-driver-test.py.in b/tests/create-driver-test.py.in index e5ab33c4..4a9229f6 100755 --- a/tests/create-driver-test.py.in +++ b/tests/create-driver-test.py.in @@ -63,13 +63,6 @@ if os.geteuid() != 0: print(f'{sys.argv[0]} is expected to be run as root') sys.exit(1) -# Check that tshark is available - -tshark = shutil.which('tshark') -if not tshark: - print("The 'tshark' WireShark command-line tool must be installed to capture USB traffic") - sys.exit(1) - # Find the fingerprint reader ctx = FPrint.Context() ctx.enumerate() @@ -96,6 +89,12 @@ else: print(f'### Detected USB device {device}') + # Check that tshark is available + tshark = shutil.which('tshark') + if not tshark: + print("The 'tshark' WireShark command-line tool must be installed to capture USB traffic") + sys.exit(1) + # Make directory test_dir = SRCDIR + '/tests/' + test_name diff --git a/tests/crfpmoc/custom.ioctl.orig b/tests/crfpmoc/custom.ioctl.orig deleted file mode 100644 index 7d8bcdef..00000000 --- a/tests/crfpmoc/custom.ioctl.orig +++ /dev/null @@ -1,21 +0,0 @@ -@DEV /dev/cros_fp -CROS_EC_DEV_IOCXCMD_V2 4 000000000204000004000000040000000000000080000000 -CROS_EC_DEV_IOCXCMD_V2 4 000000000204000004000000040000000000000030000000 -CROS_EC_DEV_IOCXCMD_V2 4 000000000204000004000000040000000000000010000000 -CROS_EC_DEV_IOCXCMD_V2 4 000000000204000004000000040000000000000030000000 -CROS_EC_DEV_IOCXCMD_V2 4 000000000204000004000000040000000000000010000000 -CROS_EC_DEV_IOCXCMD_V2 4 000000000204000004000000040000000000000030000000 -CROS_EC_DEV_IOCXCMD_V2 4 000000000204000004000000040000000000000010000000 -CROS_EC_DEV_IOCXCMD_V2 4 000000000204000004000000040000000000000030000000 -CROS_EC_DEV_IOCXCMD_V2 4 000000000204000004000000040000000000000010000000 -CROS_EC_DEV_IOCXCMD_V2 4 000000000204000004000000040000000000000030000000 -CROS_EC_DEV_IOCXCMD_V2 4 000000000204000004000000040000000000000000000000 -CROS_EC_DEV_IOCXCMD_V2 48 010000000304000000000000300000000000000046504320090000001B020000010000009466000047524559A000A0000800FF0324140000050001000100000004000000 -CROS_EC_DEV_IOCXCMD_V2 4 000000000204000004000000040000000000000040000000 -CROS_EC_DEV_IOCXCMD_V2 4 000000000204000004000000040000000000000000000000 -CROS_EC_DEV_IOCXCMD_V2 22 0000000007040000000000001600000000000000309301001A47020039DF0300E9A0B112000000000000 -CROS_EC_DEV_IOCXCMD_V2 4 000000000204000004000000040000000000000040000000 -CROS_EC_DEV_IOCXCMD_V2 4 000000000204000004000000040000000000000000000000 -CROS_EC_DEV_IOCXCMD_V2 22 000000000704000000000000160000000000000029930100174902002DE10300AC88C512000000000000 -CROS_EC_DEV_IOCXCMD_V2 4 000000000204000004000000040000000000000080000000 -CROS_EC_DEV_IOCXCMD_V2 4 000000000204000004000000040000000000000000000000 diff --git a/tests/crfpmoc/device.orig b/tests/crfpmoc/device.orig deleted file mode 100644 index 92dd7246..00000000 --- a/tests/crfpmoc/device.orig +++ /dev/null @@ -1,93 +0,0 @@ -P: /devices/platform/AMDI0020:01/AMDI0020:01:0/AMDI0020:01:0.0/serial0/serial0-0/cros-ec-dev.2.auto/misc/cros_fp -N: cros_fp -E: DEVNAME=/dev/cros_fp -E: MAJOR=10 -E: MINOR=122 -E: SUBSYSTEM=misc -A: dev=10:122\n -L: device=../../../cros-ec-dev.2.auto -A: power/control=auto\n -A: power/runtime_active_time=0\n -A: power/runtime_status=unsupported\n -A: power/runtime_suspended_time=0\n - -P: /devices/platform/AMDI0020:01/AMDI0020:01:0/AMDI0020:01:0.0/serial0/serial0-0/cros-ec-dev.2.auto -E: DRIVER=cros-ec-dev -E: ID_PATH=platform-AMDI0020:01-platform-cros-ec-dev.2.auto -E: ID_PATH_TAG=platform-AMDI0020_01-platform-cros-ec-dev_2_auto -E: ID_VENDOR_FROM_DATABASE=Amdek Corporation -E: MODALIAS=platform:cros-ec-dev -E: SUBSYSTEM=platform -L: driver=../../../../../../../../bus/platform/drivers/cros-ec-dev -A: driver_override=(null)\n -A: modalias=platform:cros-ec-dev\n -A: power/control=auto\n -A: power/runtime_active_time=0\n -A: power/runtime_status=unsupported\n -A: power/runtime_suspended_time=0\n - -P: /devices/platform/AMDI0020:01/AMDI0020:01:0/AMDI0020:01:0.0/serial0/serial0-0 -E: DRIVER=cros-ec-uart -E: MODALIAS=of:NcrfpTCgoogle,cros-ec-uart -E: SUBSYSTEM=serial -L: driver=../../../../../../../bus/serial/drivers/cros-ec-uart -L: firmware_node=../../../../../../LNXSYSTM:00/LNXSYBUS:00/AMDI0020:01/PRP0001:00 -A: modalias=of:NcrfpTCgoogle,cros-ec-uart\n -A: power/control=auto\n -A: power/runtime_active_time=0\n -A: power/runtime_status=unsupported\n -A: power/runtime_suspended_time=0\n - -P: /devices/platform/AMDI0020:01/AMDI0020:01:0/AMDI0020:01:0.0/serial0 -E: SUBSYSTEM=serial -L: firmware_node=../../../../../LNXSYSTM:00/LNXSYBUS:00/AMDI0020:01 -A: power/wakeup=disabled\n -A: power/wakeup_abort_count=\n -A: power/wakeup_active=\n -A: power/wakeup_active_count=\n -A: power/wakeup_count=\n -A: power/wakeup_expire_count=\n -A: power/wakeup_last_time_ms=\n -A: power/wakeup_max_time_ms=\n -A: power/wakeup_total_time_ms=\n -L: software_node=../../../../../../kernel/software_nodes/node1 -A: waiting_for_supplier=0\n - -P: /devices/platform/AMDI0020:01/AMDI0020:01:0/AMDI0020:01:0.0 -E: DEVTYPE=port -E: DRIVER=port -E: SUBSYSTEM=serial-base -L: driver=../../../../../bus/serial-base/drivers/port -A: power/autosuspend_delay_ms=500\n -A: power/control=auto\n -A: power/runtime_active_time=286257\n -A: power/runtime_status=active\n -A: power/runtime_suspended_time=3893\n - -P: /devices/platform/AMDI0020:01/AMDI0020:01:0 -E: DEVTYPE=ctrl -E: DRIVER=ctrl -E: SUBSYSTEM=serial-base -L: driver=../../../../bus/serial-base/drivers/ctrl -A: power/control=auto\n -A: power/runtime_active_time=286264\n -A: power/runtime_status=active\n -A: power/runtime_suspended_time=3892\n - -P: /devices/platform/AMDI0020:01 -E: DRIVER=dw-apb-uart -E: ID_PATH=platform-AMDI0020:01 -E: ID_PATH_TAG=platform-AMDI0020_01 -E: ID_VENDOR_FROM_DATABASE=Amdek Corporation -E: MODALIAS=acpi:AMDI0020: -E: SUBSYSTEM=platform -L: driver=../../../bus/platform/drivers/dw-apb-uart -A: driver_override=(null)\n -L: firmware_node=../../LNXSYSTM:00/LNXSYBUS:00/AMDI0020:01 -A: modalias=acpi:AMDI0020:\n -A: power/control=auto\n -A: power/runtime_active_time=286263\n -A: power/runtime_status=active\n -A: power/runtime_suspended_time=3889\n -L: software_node=../../../kernel/software_nodes/node1 - diff --git a/tests/meson.build b/tests/meson.build index 4bb6850e..537325c2 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -33,12 +33,12 @@ installed_tests_testdir = datadir / 'installed-tests' / versioned_libname installed_tests_libdir = libdir drivers_tests = [ -# 'aes2501', + 'aes2501', 'aes3500', 'elan', 'elan-cobo', 'elanmoc', -# 'elanspi', + 'elanspi', 'synaptics', 'upektc_img', 'upektc_img-tcs1s', @@ -59,7 +59,7 @@ drivers_tests = [ 'realtek', 'realtek-5816', 'focaltech_moc', - # 'crfpmoc', +# 'crfpmoc', ] if get_option('introspection')