From 82b1603a753fe3b7070eef93d210682223aff445 Mon Sep 17 00:00:00 2001 From: Jan Breuer <jan.breuer@jaybee.cz> Date: 周一, 16 1月 2023 23:43:07 +0800 Subject: [PATCH] Merge pull request #142 from j123b567/feature/c89-c99-support --- libscpi/test/test_parser.c | 42 ++++++++++++++++++++++++++++++++++++++---- 1 files changed, 38 insertions(+), 4 deletions(-) diff --git a/libscpi/test/test_parser.c b/libscpi/test/test_parser.c index 9026285..1b214c3 100644 --- a/libscpi/test/test_parser.c +++ b/libscpi/test/test_parser.c @@ -1,6 +1,29 @@ -/* - * File: test_parser.c - * Author: Jan Breuer +/*- + * BSD 2-Clause License + * + * Copyright (c) 2012-2018, Jan Breuer + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include <stdio.h> @@ -127,7 +150,7 @@ err_buffer_pos = 0; SCPI_RegClearBits(&scpi_context, SCPI_REG_STB, STB_QMA); - SCPI_EventClear(&scpi_context); + SCPI_RegSet(&scpi_context, SCPI_REG_ESR, 0); SCPI_ErrorClear(&scpi_context); } @@ -234,6 +257,9 @@ TEST_INPUT("*IDN?;*IDN?;*IDN?;*IDN?\r\n", "MA,IN,0,VER;MA,IN,0,VER;MA,IN,0,VER;MA,IN,0,VER\r\n"); output_buffer_clear(); + TEST_INPUT("*IDN?;STUB\r\n", "MA,IN,0,VER\r\n"); + output_buffer_clear(); + TEST_INPUT("*IDN?;*OPC;*IDN?\r\n", "MA,IN,0,VER;MA,IN,0,VER\r\n"); output_buffer_clear(); @@ -242,6 +268,14 @@ TEST_INPUT("\r\n", "MA,IN,0,VER\r\n"); output_buffer_clear(); + /* Test empty command at the beggining */ + TEST_INPUT(";*IDN?\r\n", "MA,IN,0,VER\r\n"); + output_buffer_clear(); + + TEST_INPUT(";", ""); + TEST_INPUT("*IDN?\r\n", "MA,IN,0,VER\r\n"); + output_buffer_clear(); + /* Test input "timeout" - input with length == 0 */ TEST_INPUT("*IDN?", ""); TEST_INPUT("", "MA,IN,0,VER\r\n"); -- Gitblit v1.9.1