From: Gerhard Sittig Date: Wed, 22 Jul 2020 19:45:32 +0000 (+0200) Subject: can: add Python output to std and ext brs test cases X-Git-Url: http://sigrok.org/gitweb/?p=sigrok-test.git;a=commitdiff_plain;h=b8f27d2417083c8bb0198a0d48a38726504d9303 can: add Python output to std and ext brs test cases The CAN decoder implementation got extended to output Python data. Adjust the test expectation to cover these on some dump files. --- diff --git a/decoder/test/can/can_fd_ext_brs_64.python b/decoder/test/can/can_fd_ext_brs_64.python new file mode 100644 index 0000000..fd26c39 --- /dev/null +++ b/decoder/test/can/can_fd_ext_brs_64.python @@ -0,0 +1 @@ +5068-38639 can: ('extended', 66, 'data', 15, [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63]) diff --git a/decoder/test/can/can_fd_ext_brs_8.python b/decoder/test/can/can_fd_ext_brs_8.python new file mode 100644 index 0000000..47bf6c6 --- /dev/null +++ b/decoder/test/can/can_fd_ext_brs_8.python @@ -0,0 +1 @@ +2117-12235 can: ('extended', 66, 'data', 8, [0, 1, 2, 3, 4, 5, 6, 7]) diff --git a/decoder/test/can/can_fd_std_brs_64.python b/decoder/test/can/can_fd_std_brs_64.python new file mode 100644 index 0000000..dac7a35 --- /dev/null +++ b/decoder/test/can/can_fd_std_brs_64.python @@ -0,0 +1 @@ +5084-36455 can: ('standard', 66, None, 15, [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63]) diff --git a/decoder/test/can/can_fd_std_brs_8.python b/decoder/test/can/can_fd_std_brs_8.python new file mode 100644 index 0000000..7027d3a --- /dev/null +++ b/decoder/test/can/can_fd_std_brs_8.python @@ -0,0 +1 @@ +1084-9001 can: ('standard', 66, None, 8, [0, 1, 2, 3, 4, 5, 6, 7]) diff --git a/decoder/test/can/test.conf b/decoder/test/can/test.conf index 03e3143..c16e036 100644 --- a/decoder/test/can/test.conf +++ b/decoder/test/can/test.conf @@ -63,18 +63,22 @@ test can_fd_std_brs_8 protocol-decoder can channel can_rx=0 option nominal_bitrate=1000000 input can/can_fd/arbitrary_traffic/can_fd_std_brs_8.sr output can annotation match can_fd_std_brs_8.output + output can python match can_fd_std_brs_8.python test can_fd_std_brs_64 protocol-decoder can channel can_rx=0 option nominal_bitrate=1000000 input can/can_fd/arbitrary_traffic/can_fd_std_brs_64.sr output can annotation match can_fd_std_brs_64.output + output can python match can_fd_std_brs_64.python test can_fd_ext_brs_8 protocol-decoder can channel can_rx=0 option nominal_bitrate=1000000 input can/can_fd/arbitrary_traffic/can_fd_ext_brs_8.sr output can annotation match can_fd_ext_brs_8.output + output can python match can_fd_ext_brs_8.python test can_fd_ext_brs_64 protocol-decoder can channel can_rx=0 option nominal_bitrate=1000000 input can/can_fd/arbitrary_traffic/can_fd_ext_brs_64.sr output can annotation match can_fd_ext_brs_64.output + output can python match can_fd_ext_brs_64.python