From cb38dba9fe0344b02f4b183152263fe3c0066290 Mon Sep 17 00:00:00 2001 From: Iztok Jeras <iztok.jeras@redpitaya.com> Date: ćšć, 08 10æ 2015 03:00:34 +0800 Subject: [PATCH] integer parse: added support for float --- libscpi/test/test_parser.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libscpi/test/test_parser.c b/libscpi/test/test_parser.c index 0e0da0c..3ab2640 100644 --- a/libscpi/test/test_parser.c +++ b/libscpi/test/test_parser.c @@ -32,14 +32,14 @@ static scpi_result_t test_treeA(scpi_t* context) { - SCPI_ResultInt(context, 10); + SCPI_ResultInt32(context, 10); return SCPI_RES_OK; } static scpi_result_t test_treeB(scpi_t* context) { - SCPI_ResultInt(context, 20); + SCPI_ResultInt32(context, 20); return SCPI_RES_OK; } @@ -95,6 +95,7 @@ memcpy(output_buffer + output_buffer_pos, data, len); output_buffer_pos += len; output_buffer[output_buffer_pos] = '\0'; + return len; } scpi_t scpi_context; @@ -120,6 +121,8 @@ } static scpi_result_t SCPI_Flush(scpi_t * context) { + (void) context; + return SCPI_RES_OK; } @@ -133,6 +136,8 @@ scpi_reg_val_t srq_val = 0; static scpi_result_t SCPI_Control(scpi_t * context, scpi_ctrl_name_t ctrl, scpi_reg_val_t val) { + (void) context; + if (SCPI_CTRL_SRQ == ctrl) { srq_val = val; } else { @@ -144,6 +149,8 @@ scpi_bool_t RST_executed = FALSE; static scpi_result_t SCPI_Reset(scpi_t * context) { + (void) context; + RST_executed = TRUE; return SCPI_RES_OK; } @@ -550,6 +557,7 @@ errCode = SCPI_ErrorPop(&scpi_context); \ CU_ASSERT_EQUAL(result2, expected_result); \ if (expected_result == SCPI_EXPR_OK) { \ + CU_ASSERT_EQUAL(val_dimensions, expected_dimensions); \ CU_ASSERT_EQUAL(val_range, expected_range); \ { size_t i; for(i = 0; (i < val_len) && (i < val_dimensions); i++) { \ CU_ASSERT_EQUAL(val_from[i], expected_from[i]); \ -- Gitblit v1.9.1