From 6e5e3e0e3fc450eaf53feee059824ad85c4f270d Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: ćšć, 06 8æ 2015 22:32:35 +0800
Subject: [PATCH] Resolve #38 Error queue not empty bit
---
libscpi/test/test_parser.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/libscpi/test/test_parser.c b/libscpi/test/test_parser.c
index 76a4053..84761c5 100644
--- a/libscpi/test/test_parser.c
+++ b/libscpi/test/test_parser.c
@@ -102,6 +102,7 @@
err_buffer[0] = 0;
err_buffer_pos = 0;
+ SCPI_RegClearBits(&scpi_context, SCPI_REG_STB, STB_QMA);
SCPI_EventClear(&scpi_context);
SCPI_ErrorClear(&scpi_context);
}
@@ -280,15 +281,17 @@
srq_val = 0;
TEST_IEEE4882("ABCD\r\n", ""); /* "Undefined header" cause command error */
- CU_ASSERT_EQUAL(srq_val, 96); /* value of STB as service request */
- TEST_IEEE4882("*STB?\r\n", "96\r\n"); /* Event status register + Service request */
+ CU_ASSERT_EQUAL(srq_val, (STB_ESR | STB_SRQ | STB_QMA)); /* value of STB as service request */
+ TEST_IEEE4882("*STB?\r\n", "100\r\n"); /* Event status register + Service request */
TEST_IEEE4882("*ESR?\r\n", "32\r\n"); /* Command error */
- TEST_IEEE4882("*STB?\r\n", "0\r\n");
+ TEST_IEEE4882("*STB?\r\n", "68\r\n"); /* Error queue is still not empty */
TEST_IEEE4882("*ESR?\r\n", "0\r\n");
TEST_IEEE4882("SYST:ERR:NEXT?\r\n", "-113,\"Undefined header\"\r\n");
TEST_IEEE4882("SYST:ERR:NEXT?\r\n", "0,\"No error\"\r\n");
+
+ TEST_IEEE4882("*STB?\r\n", "0\r\n"); /* Error queue is now empty */
RST_executed = FALSE;
TEST_IEEE4882("*RST\r\n", "");
--
Gitblit v1.9.1