YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix unused parameter related build issues on Windows (#3003)

Browse Source 
MSVC doen't support __attribute__((unused)),
we should use JERRY_UNUSED macro instead.

Additionally removed the internal jrt.h include from
tests/unit-core/test-common.h which was layering violation.
It made JERRY_ASSERT unavailable, we should use TEST_ASSERT.

JerryScript-DCO-1.0-Signed-off-by: Csaba Osztrogonác oszi@inf.u-szeged.hu
This commit is contained in:
Csaba Osztrogonác
2019-08-06 10:13:41 +02:00
committed by Robert Fancsik
parent 27da5a538c
commit 051febfed7
5 changed files with 110 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/unit-core/test-api-set-and-clear-error-flag.c
+27 -27
View File
@@ -20,10 +20,10 @@ static void
compare_str (jerry_value_t value, const jerry_char_t *str_p, size_t str_len)
{
jerry_size_t size = jerry_get_string_size (value);
JERRY_ASSERT (str_len == size);
TEST_ASSERT (str_len == size);
JERRY_VLA (jerry_char_t, str_buff, size);
jerry_string_to_utf8_char_buffer (value, str_buff, size);
JERRY_ASSERT (!memcmp (str_p, str_buff, str_len));
TEST_ASSERT (!memcmp (str_p, str_buff, str_len));
} /* compare_str */
int
@@ -39,7 +39,7 @@ main (void)
obj_val = jerry_get_value_from_error (err_val, true);
JERRY_ASSERT (obj_val != err_val);
TEST_ASSERT (obj_val != err_val);
jerry_release_value (err_val);
jerry_release_value (obj_val);
@@ -79,7 +79,7 @@ main (void)
str = jerry_create_string (pterodactylus);
error = jerry_create_error_from_value (str, true);
error = jerry_create_abort_from_value (error, true);
JERRY_ASSERT (jerry_value_is_abort (error));
TEST_ASSERT (jerry_value_is_abort (error));
str = jerry_get_value_from_error (error, true);
compare_str (str, pterodactylus, pterodactylus_size);
@@ -88,7 +88,7 @@ main (void)
str = jerry_create_string (pterodactylus);
error = jerry_create_error_from_value (str, true);
jerry_value_t error2 = jerry_create_abort_from_value (error, false);
JERRY_ASSERT (jerry_value_is_abort (error2));
TEST_ASSERT (jerry_value_is_abort (error2));
jerry_release_value (error);
str = jerry_get_value_from_error (error2, true);
@@ -98,77 +98,77 @@ main (void)
double test_num = 3.1415926;
jerry_value_t num = jerry_create_number (test_num);
jerry_value_t num2 = jerry_create_error_from_value (num, false);
JERRY_ASSERT (jerry_value_is_error (num2));
TEST_ASSERT (jerry_value_is_error (num2));
jerry_release_value (num);
num2 = jerry_get_value_from_error (num2, true);
JERRY_ASSERT (jerry_get_number_value (num2) == test_num);
TEST_ASSERT (jerry_get_number_value (num2) == test_num);
jerry_release_value (num2);
num = jerry_create_number (test_num);
num2 = jerry_create_error_from_value (num, true);
JERRY_ASSERT (jerry_value_is_error (num2));
TEST_ASSERT (jerry_value_is_error (num2));
num2 = jerry_get_value_from_error (num2, true);
JERRY_ASSERT (jerry_get_number_value (num2) == test_num);
TEST_ASSERT (jerry_get_number_value (num2) == test_num);
jerry_release_value (num2);
num = jerry_create_number (test_num);
num2 = jerry_create_error_from_value (num, false);
JERRY_ASSERT (jerry_value_is_error (num2));
TEST_ASSERT (jerry_value_is_error (num2));
jerry_release_value (num);
jerry_value_t num3 = jerry_create_error_from_value (num2, false);
JERRY_ASSERT (jerry_value_is_error (num3));
TEST_ASSERT (jerry_value_is_error (num3));
jerry_release_value (num2);
num2 = jerry_get_value_from_error (num3, true);
JERRY_ASSERT (jerry_get_number_value (num2) == test_num);
TEST_ASSERT (jerry_get_number_value (num2) == test_num);
jerry_release_value (num2);
num = jerry_create_number (test_num);
num2 = jerry_create_error_from_value (num, true);
JERRY_ASSERT (jerry_value_is_error (num2));
TEST_ASSERT (jerry_value_is_error (num2));
num3 = jerry_create_error_from_value (num2, true);
JERRY_ASSERT (jerry_value_is_error (num3));
TEST_ASSERT (jerry_value_is_error (num3));
num2 = jerry_get_value_from_error (num3, true);
JERRY_ASSERT (jerry_get_number_value (num2) == test_num);
TEST_ASSERT (jerry_get_number_value (num2) == test_num);
jerry_release_value (num2);
num = jerry_create_number (test_num);
error = jerry_create_abort_from_value (num, true);
JERRY_ASSERT (jerry_value_is_abort (error));
TEST_ASSERT (jerry_value_is_abort (error));
num2 = jerry_create_error_from_value (error, true);
JERRY_ASSERT (jerry_value_is_error (num2));
TEST_ASSERT (jerry_value_is_error (num2));
num = jerry_get_value_from_error (num2, true);
JERRY_ASSERT (jerry_get_number_value (num) == test_num);
TEST_ASSERT (jerry_get_number_value (num) == test_num);
jerry_release_value (num);
num = jerry_create_number (test_num);
error = jerry_create_abort_from_value (num, false);
jerry_release_value (num);
JERRY_ASSERT (jerry_value_is_abort (error));
TEST_ASSERT (jerry_value_is_abort (error));
num2 = jerry_create_error_from_value (error, true);
JERRY_ASSERT (jerry_value_is_error (num2));
TEST_ASSERT (jerry_value_is_error (num2));
num = jerry_get_value_from_error (num2, true);
JERRY_ASSERT (jerry_get_number_value (num) == test_num);
TEST_ASSERT (jerry_get_number_value (num) == test_num);
jerry_release_value (num);
num = jerry_create_number (test_num);
error = jerry_create_abort_from_value (num, true);
JERRY_ASSERT (jerry_value_is_abort (error));
TEST_ASSERT (jerry_value_is_abort (error));
num2 = jerry_create_error_from_value (error, false);
jerry_release_value (error);
JERRY_ASSERT (jerry_value_is_error (num2));
TEST_ASSERT (jerry_value_is_error (num2));
num = jerry_get_value_from_error (num2, true);
JERRY_ASSERT (jerry_get_number_value (num) == test_num);
TEST_ASSERT (jerry_get_number_value (num) == test_num);
jerry_release_value (num);
num = jerry_create_number (test_num);
error = jerry_create_abort_from_value (num, false);
jerry_release_value (num);
JERRY_ASSERT (jerry_value_is_abort (error));
TEST_ASSERT (jerry_value_is_abort (error));
num2 = jerry_create_error_from_value (error, false);
jerry_release_value (error);
JERRY_ASSERT (jerry_value_is_error (num2));
TEST_ASSERT (jerry_value_is_error (num2));
num = jerry_get_value_from_error (num2, true);
JERRY_ASSERT (jerry_get_number_value (num) == test_num);
TEST_ASSERT (jerry_get_number_value (num) == test_num);
jerry_release_value (num);
jerry_value_t value = jerry_create_number (42);
tests/unit-core/test-common.h
+4 -2
View File
@@ -16,7 +16,7 @@
#ifndef TEST_COMMON_H
#define TEST_COMMON_H
#include "jrt.h"
#include "jerryscript-port.h"
#include <math.h>
#include <setjmp.h>
@@ -25,6 +25,8 @@
#include <stdarg.h>
#include <string.h>
#define JERRY_UNUSED(x) ((void) (x))
#define TEST_ASSERT(x) \
do \
{ \
@@ -36,7 +38,7 @@
__FILE__, \
__func__, \
(unsigned long) __LINE__); \
jerry_fatal (ERR_FAILED_INTERNAL_ASSERTION); \
jerry_port_fatal (ERR_FAILED_INTERNAL_ASSERTION); \
} \
} while (0)