test: inline helper functions

toyobayashi · Sep 14, 2023 · 3d0a7e0 · 3d0a7e0
1 parent 1165480
commit 3d0a7e0
Show file tree

Hide file tree

Showing 38 changed files with 140 additions and 89 deletions.
diff --git a/packages/test/CMakeLists.txt b/packages/test/CMakeLists.txt
@@ -122,15 +122,15 @@ set(EMNAPI_FIND_NODE_ADDON_API ON)
 add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/../emnapi" "${CMAKE_CURRENT_BINARY_DIR}/emnapi")
 endif()
 
-add_library(testcommon STATIC "./common.c")
+# add_library(testcommon STATIC "./common.c")
 
 set(WASM32_MALLOC "emmalloc")
 
 function(add_test NAME SOURCE_LIST NEED_ENTRY PTHREAD LINKOPTIONS)
   set(__SRC_LIST ${SOURCE_LIST})
-  if(NEED_ENTRY)
-    list(APPEND __SRC_LIST "./entry_point.c")
-  endif()
+  # if(NEED_ENTRY)
+  #   list(APPEND __SRC_LIST "./entry_point.c")
+  # endif()
   if(IS_WASM)
     add_executable(${NAME} ${__SRC_LIST})
     if(IS_WASI OR IS_WASM32)
@@ -157,7 +157,7 @@ function(add_test NAME SOURCE_LIST NEED_ENTRY PTHREAD LINKOPTIONS)
 
   set_target_properties(${NAME} PROPERTIES
     BUILD_RPATH "$ORIGIN")
-  target_link_libraries(${NAME} PRIVATE "testcommon")
+  # target_link_libraries(${NAME} PRIVATE "testcommon")
   if(IS_WASM)
     if(PTHREAD)
       if((IS_WASI AND NOT IS_WASI_THREADS) OR IS_WASM32)
@@ -302,9 +302,9 @@ target_compile_definitions("reference_obj_only" PRIVATE "NAPI_VERSION=8")
 add_test("reference_all_types" "./ref_by_node_api_version/binding.c" OFF OFF "")
 target_compile_definitions("reference_all_types" PRIVATE "NAPI_EXPERIMENTAL")
 
-add_test("runjs_pe" "./runjs/binding.c;./runjs/entry_point.c" OFF OFF "")
+add_test("runjs_pe" "./runjs/binding.c" OFF OFF "")
 target_compile_definitions("runjs_pe" PRIVATE "NAPI_VERSION=8")
-add_test("runjs_cnrj" "./runjs/binding.c;./runjs/entry_point.c" OFF OFF "")
+add_test("runjs_cnrj" "./runjs/binding.c" OFF OFF "")
 target_compile_definitions("runjs_cnrj" PRIVATE "NAPI_EXPERIMENTAL")
 
 if(IS_WASM)

diff --git a/packages/test/arg/binding.c b/packages/test/arg/binding.c
@@ -1,5 +1,6 @@
 #include <js_native_api.h>
 #include "../common.h"
+#include "../entry_point.h"
 
 static napi_value Add(napi_env env, napi_callback_info info) {
   size_t argc = 2;

diff --git a/packages/test/array/binding.c b/packages/test/array/binding.c
@@ -1,6 +1,7 @@
 #include <js_native_api.h>
 // #include <string.h>
 #include "../common.h"
+#include "../entry_point.h"
 
 static napi_value TestGetElement(napi_env env, napi_callback_info info) {
   size_t argc = 2;

diff --git a/packages/test/bigint/binding.c b/packages/test/bigint/binding.c
@@ -5,6 +5,7 @@
 #endif
 #include <js_native_api.h>
 #include "../common.h"
+#include "../entry_point.h"
 
 static napi_value IsLossless(napi_env env, napi_callback_info info) {
   size_t argc = 2;

diff --git a/packages/test/callback/binding.c b/packages/test/callback/binding.c
@@ -1,5 +1,6 @@
 #include <js_native_api.h>
 #include "../common.h"
+#include "../entry_point.h"
 #if !defined(__wasm__) || (defined(__EMSCRIPTEN__) || defined(__wasi__))
 #include <string.h>
 #endif

diff --git a/packages/test/cbinfo/binding.c b/packages/test/cbinfo/binding.c
@@ -1,5 +1,6 @@
 #include <js_native_api.h>
 #include "../common.h"
+#include "../entry_point.h"
 
 static napi_value Test1(napi_env env, napi_callback_info info) {
   size_t argc = 1;

diff --git a/packages/test/common-inl.h b/packages/test/common-inl.h
@@ -0,0 +1,59 @@
+#ifndef JS_NATIVE_API_COMMON_INL_H_
+#define JS_NATIVE_API_COMMON_INL_H_
+
+#include <js_native_api.h>
+#include "common.h"
+
+#if !defined(__wasm__) || (defined(__EMSCRIPTEN__) || defined(__wasi__))
+#include <stdio.h>
+#endif
+
+inline void add_returned_status(napi_env env,
+                                const char* key,
+                                napi_value object,
+                                char* expected_message,
+                                napi_status expected_status,
+                                napi_status actual_status) {
+  char napi_message_string[100] = "";
+  napi_value prop_value;
+#if !defined(__wasm__) || (defined(__EMSCRIPTEN__) || defined(__wasi__))
+  if (actual_status != expected_status) {
+    snprintf(napi_message_string,
+             sizeof(napi_message_string),
+             "Invalid status [%d]",
+             actual_status);
+  }
+#endif
+
+  NODE_API_CALL_RETURN_VOID(
+      env,
+      napi_create_string_utf8(
+          env,
+          (actual_status == expected_status ? expected_message
+                                            : napi_message_string),
+          NAPI_AUTO_LENGTH,
+          &prop_value));
+  NODE_API_CALL_RETURN_VOID(
+      env, napi_set_named_property(env, object, key, prop_value));
+}
+
+inline void add_last_status(napi_env env,
+                            const char* key,
+                            napi_value return_value) {
+  napi_value prop_value;
+  const napi_extended_error_info* p_last_error;
+  NODE_API_CALL_RETURN_VOID(env, napi_get_last_error_info(env, &p_last_error));
+
+  NODE_API_CALL_RETURN_VOID(
+      env,
+      napi_create_string_utf8(
+          env,
+          (p_last_error->error_message == NULL ? "napi_ok"
+                                               : p_last_error->error_message),
+          NAPI_AUTO_LENGTH,
+          &prop_value));
+  NODE_API_CALL_RETURN_VOID(
+      env, napi_set_named_property(env, return_value, key, prop_value));
+}
+
+#endif  // JS_NATIVE_API_COMMON_INL_H_
diff --git a/packages/test/common.c b/packages/test/common.c
diff --git a/packages/test/common.h b/packages/test/common.h
@@ -1,3 +1,6 @@
+#ifndef JS_NATIVE_API_COMMON_H_
+#define JS_NATIVE_API_COMMON_H_
+
 #include <js_native_api.h>
 
 // Empty value so that macros here are able to return NULL or void
@@ -10,15 +13,16 @@
     bool is_pending;                                                     \
     const char* err_message = error_info->error_message;                 \
     napi_is_exception_pending((env), &is_pending);                       \
+    /* If an exception is already pending, don't rethrow it */           \
     if (!is_pending) {                                                   \
       const char* error_message = err_message != NULL ?                  \
-        err_message :                                                    \
-        "empty error message";                                           \
+                       err_message :                                     \
+                      "empty error message";                             \
       napi_throw_error((env), NULL, error_message);                      \
     }                                                                    \
   } while (0)
 
-#define NODE_API_ASSERT_BASE(env, assertion, message, ret_val)               \
+#define NODE_API_ASSERT_BASE(env, assertion, message, ret_val)           \
   do {                                                                   \
     if (!(assertion)) {                                                  \
       napi_throw_error(                                                  \
@@ -31,15 +35,15 @@
 
 // Returns NULL on failed assertion.
 // This is meant to be used inside napi_callback methods.
-#define NODE_API_ASSERT(env, assertion, message)                             \
+#define NODE_API_ASSERT(env, assertion, message)                         \
   NODE_API_ASSERT_BASE(env, assertion, message, NULL)
 
 // Returns empty on failed assertion.
 // This is meant to be used inside functions with void return type.
-#define NODE_API_ASSERT_RETURN_VOID(env, assertion, message)                 \
+#define NODE_API_ASSERT_RETURN_VOID(env, assertion, message)             \
   NODE_API_ASSERT_BASE(env, assertion, message, NODE_API_RETVAL_NOTHING)
 
-#define NODE_API_CALL_BASE(env, the_call, ret_val)                           \
+#define NODE_API_CALL_BASE(env, the_call, ret_val)                       \
   do {                                                                   \
     if ((the_call) != napi_ok) {                                         \
       GET_AND_THROW_LAST_ERROR((env));                                   \
@@ -48,35 +52,44 @@
   } while (0)
 
 // Returns NULL if the_call doesn't return napi_ok.
-#define NODE_API_CALL(env, the_call)                                         \
+#define NODE_API_CALL(env, the_call)                                     \
   NODE_API_CALL_BASE(env, the_call, NULL)
 
 // Returns empty if the_call doesn't return napi_ok.
-#define NODE_API_CALL_RETURN_VOID(env, the_call)                             \
+#define NODE_API_CALL_RETURN_VOID(env, the_call)                         \
   NODE_API_CALL_BASE(env, the_call, NODE_API_RETVAL_NOTHING)
 
-#define NODE_API_CHECK_STATUS(the_call)                                            \
-  do {                                                                         \
-    napi_status status = (the_call);                                           \
-    if (status != napi_ok) {                                                   \
-      return status;                                                           \
-    }                                                                          \
+#define NODE_API_CHECK_STATUS(the_call)                                  \
+  do {                                                                   \
+    napi_status status = (the_call);                                     \
+    if (status != napi_ok) {                                             \
+      return status;                                                     \
+    }                                                                    \
   } while (0)
 
-#define NODE_API_ASSERT_STATUS(env, assertion, message)                        \
+#define NODE_API_ASSERT_STATUS(env, assertion, message)                  \
   NODE_API_ASSERT_BASE(env, assertion, message, napi_generic_failure)
 
-#define DECLARE_NODE_API_PROPERTY(name, func)                                \
+#define DECLARE_NODE_API_PROPERTY(name, func)                            \
   { (name), NULL, (func), NULL, NULL, NULL, napi_default, NULL }
 
-#define DECLARE_NODE_API_GETTER(name, func)                                  \
+#define DECLARE_NODE_API_GETTER(name, func)                              \
   { (name), NULL, NULL, (func), NULL, NULL, napi_default, NULL }
 
-void add_returned_status(napi_env env,
-                         const char* key,
-                         napi_value object,
-                         char* expected_message,
-                         napi_status expected_status,
-                         napi_status actual_status);
+#define DECLARE_NODE_API_PROPERTY_VALUE(name, value)                     \
+  { (name), NULL, NULL, NULL, NULL, (value), napi_default, NULL }
+
+static inline void add_returned_status(napi_env env,
+                                       const char* key,
+                                       napi_value object,
+                                       char* expected_message,
+                                       napi_status expected_status,
+                                       napi_status actual_status);
+
+static inline void add_last_status(napi_env env,
+                                   const char* key,
+                                   napi_value return_value);
+
+#include "common-inl.h"
 
-void add_last_status(napi_env env, const char* key, napi_value return_value);
+#endif  // JS_NATIVE_API_COMMON_H_
diff --git a/packages/test/constructor/binding.c b/packages/test/constructor/binding.c
@@ -1,5 +1,6 @@
 #include <js_native_api.h>
 #include "../common.h"
+#include "../entry_point.h"
 #include "test_null.h"
 
 static double value_ = 1;

diff --git a/packages/test/conversion/test_conversions.c b/packages/test/conversion/test_conversions.c
@@ -1,5 +1,6 @@
 #include <js_native_api.h>
 #include "../common.h"
+#include "../entry_point.h"
 #include "test_null.h"
 
 static napi_value AsBool(napi_env env, napi_callback_info info) {

diff --git a/packages/test/dataview/binding.c b/packages/test/dataview/binding.c
@@ -1,6 +1,7 @@
 #include <js_native_api.h>
 // #include <string.h>
 #include "../common.h"
+#include "../entry_point.h"
 
 static napi_value CreateDataView(napi_env env, napi_callback_info info) {
   size_t argc = 3;

diff --git a/packages/test/date/binding.c b/packages/test/date/binding.c
@@ -1,5 +1,6 @@
 #include <js_native_api.h>
 #include "../common.h"
+#include "../entry_point.h"
 
 static napi_value createDate(napi_env env, napi_callback_info info) {
   size_t argc = 1;

diff --git a/packages/test/emnapitest/binding.c b/packages/test/emnapitest/binding.c
@@ -4,6 +4,7 @@
 #include "js_native_api.h"
 #include "emnapi.h"
 #include "../common.h"
+#include "../entry_point.h"
 
 void* malloc(size_t size);
 void free(void* p);

diff --git a/packages/test/entry_point.c → packages/test/entry_point.h b/packages/test/entry_point.c → packages/test/entry_point.h
@@ -1,7 +1,12 @@
+#ifndef JS_NATIVE_API_ENTRY_POINT_H_
+#define JS_NATIVE_API_ENTRY_POINT_H_
+
 #include <node_api.h>
 
 EXTERN_C_START
 napi_value Init(napi_env env, napi_value exports);
 EXTERN_C_END
 
 NAPI_MODULE(NODE_GYP_MODULE_NAME, Init)
+
+#endif  // JS_NATIVE_API_ENTRY_POINT_H_
diff --git a/packages/test/error/binding.c b/packages/test/error/binding.c
@@ -1,6 +1,7 @@
 #define NAPI_VERSION 9
 #include <js_native_api.h>
 #include "../common.h"
+#include "../entry_point.h"
 
 static napi_value checkError(napi_env env, napi_callback_info info) {
   size_t argc = 1;

diff --git a/packages/test/exception/binding.c b/packages/test/exception/binding.c
@@ -1,5 +1,6 @@
 #include <js_native_api.h>
 #include "../common.h"
+#include "../entry_point.h"
 
 static bool exceptionWasPending = false;
 static int num = 0x23432;

diff --git a/packages/test/filename/binding.c b/packages/test/filename/binding.c
@@ -1,6 +1,7 @@
 #define NAPI_EXPERIMENTAL
 #include <node_api.h>
 #include "../common.h"
+#include "../entry_point.h"
 
 static napi_value GetFilename(napi_env env, napi_callback_info info) {
   const char* filename;

diff --git a/packages/test/fnfac/binding.c b/packages/test/fnfac/binding.c
@@ -1,5 +1,6 @@
 #include <js_native_api.h>
 #include "../common.h"
+#include "../entry_point.h"
 
 static napi_value MyFunction(napi_env env, napi_callback_info info) {
   napi_value str;

diff --git a/packages/test/fnwrap/binding.cc b/packages/test/fnwrap/binding.cc
@@ -1,6 +1,7 @@
 #include <js_native_api.h>
 #include "myobject.h"
 #include "../common.h"
+#include "../entry_point.h"
 
 napi_value CreateObject(napi_env env, napi_callback_info info) {
   size_t argc = 1;

diff --git a/packages/test/function/binding.c b/packages/test/function/binding.c
@@ -1,5 +1,6 @@
 #include <js_native_api.h>
 #include "../common.h"
+#include "../entry_point.h"
 
 static napi_value TestCreateFunctionParameters(napi_env env,
                                                napi_callback_info info) {