test, tools: suppress addon function cast warnings

danbev · addaleax · commit d683da7ffa94 · 2019-02-01T16:22:23.000+01:00
Currently, there are a number of compiler warnings generated when building the addons on Linux, for example: make[1]: Entering directory '/node/test/addons/zlib-binding/build' CXX(target) Release/obj.target/binding/binding.o SOLINK_MODULE(target) Release/obj.target/binding.node COPY Release/binding.node make[1]: Leaving directory '/node/test/addons/zlib-binding/build' In file included from ../binding.cc:1: /node/src/node.h:515:51: warning: cast between incompatible function types from 'void (*)(v8::Local<v8::Object>, v8::Local<v8::Value>, v8::Local<v8::Context>)' to 'node::addon_context_register_func' {aka 'void (*)(v8::Local<v8::Object>, v8::Local<v8::Value>, v8::Local<v8::Context>, void*)'} [-Wcast-function-type] (node::addon_context_register_func) (regfunc), \ ^ /node/src/node.h:533:3: note: in expansion of macro 'NODE_MODULE_CONTEXT_AWARE_X' NODE_MODULE_CONTEXT_AWARE_X(modname, regfunc, NULL, 0) ^~~~~~~~~~~~~~~~~~~~~~~~~~~ ../binding.cc:58:1: note: in expansion of macro 'NODE_MODULE_CONTEXT_AWARE' NODE_MODULE_CONTEXT_AWARE(NODE_GYP_MODULE_NAME, Initialize) ^~~~~~~~~~~~~~~~~~~~~~~~~ This commit adds the flag -Wno-cast-function-type to suppress these warnings. With this change the warnings are not displayed anymore and the output matches that of osx when running 'make -j8 test/addons/.buildstamp'. PR-URL: #25663 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com>
diff --git a/test/addons/async-hello-world/binding.gyp b/test/addons/async-hello-world/binding.gyp
@@ -2,8 +2,8 @@
   'targets': [
     {
       'target_name': 'binding',
-      'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
-      'sources': [ 'binding.cc' ]
+      'sources': [ 'binding.cc' ],
+      'includes': ['../common.gypi'],
     }
   ]
 }
diff --git a/test/addons/async-hooks-id/binding.gyp b/test/addons/async-hooks-id/binding.gyp
@@ -2,8 +2,8 @@
   'targets': [
     {
       'target_name': 'binding',
-      'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
-      'sources': [ 'binding.cc' ]
+      'sources': [ 'binding.cc' ],
+      'includes': ['../common.gypi'],
     }
   ]
 }
diff --git a/test/addons/async-hooks-promise/binding.gyp b/test/addons/async-hooks-promise/binding.gyp
@@ -2,8 +2,8 @@
   'targets': [
     {
       'target_name': 'binding',
-      'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
-      'sources': [ 'binding.cc' ]
+      'sources': [ 'binding.cc' ],
+      'includes': ['../common.gypi'],
     }
   ]
 }
diff --git a/test/addons/async-resource/binding.gyp b/test/addons/async-resource/binding.gyp
@@ -2,8 +2,8 @@
   'targets': [
     {
       'target_name': 'binding',
-      'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
-      'sources': [ 'binding.cc' ]
+      'sources': [ 'binding.cc' ],
+      'includes': ['../common.gypi'],
     }
   ]
 }
diff --git a/test/addons/at-exit/binding.gyp b/test/addons/at-exit/binding.gyp
@@ -2,8 +2,8 @@
   'targets': [
     {
       'target_name': 'binding',
-      'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
-      'sources': [ 'binding.cc' ]
+      'sources': [ 'binding.cc' ],
+      'includes': ['../common.gypi'],
     }
   ]
 }
diff --git a/test/addons/buffer-free-callback/binding.gyp b/test/addons/buffer-free-callback/binding.gyp
@@ -2,8 +2,8 @@
   'targets': [
     {
       'target_name': 'binding',
-      'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
-      'sources': [ 'binding.cc' ]
+      'sources': [ 'binding.cc' ],
+      'includes': ['../common.gypi'],
     }
   ]
 }
diff --git a/test/addons/callback-scope/binding.gyp b/test/addons/callback-scope/binding.gyp
@@ -2,8 +2,8 @@
   'targets': [
     {
       'target_name': 'binding',
-      'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
-      'sources': [ 'binding.cc' ]
+      'sources': [ 'binding.cc' ],
+      'includes': ['../common.gypi'],
     }
   ]
 }
diff --git a/test/addons/common.gypi b/test/addons/common.gypi
@@ -0,0 +1,8 @@
+{
+  'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
+  'conditions': [
+    [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
+      'cflags': ['-Wno-cast-function-type'],
+    }],
+  ],
+}
diff --git a/test/addons/dlopen-ping-pong/binding.gyp b/test/addons/dlopen-ping-pong/binding.gyp
@@ -17,8 +17,8 @@
     },
     {
       'target_name': 'binding',
-      'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
       'sources': [ 'binding.cc' ],
+      'includes': ['../common.gypi'],
     }
   ]
 }
diff --git a/test/addons/errno-exception/binding.gyp b/test/addons/errno-exception/binding.gyp
@@ -2,8 +2,8 @@
   'targets': [
     {
       'target_name': 'binding',
-      'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
-      'sources': [ 'binding.cc' ]
+      'sources': [ 'binding.cc' ],
+      'includes': ['../common.gypi'],
     }
   ]
 }
diff --git a/test/addons/heap-profiler/binding.gyp b/test/addons/heap-profiler/binding.gyp
@@ -2,9 +2,9 @@
   'targets': [
     {
       'target_name': 'binding',
-      'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
       'sources': [ 'binding.cc' ],
-      'win_delay_load_hook': 'false'
+      'win_delay_load_hook': 'false',
+      'includes': ['../common.gypi'],
     }
   ]
 }
diff --git a/test/addons/hello-world-esm/binding.gyp b/test/addons/hello-world-esm/binding.gyp
@@ -2,8 +2,8 @@
   'targets': [
     {
       'target_name': 'binding',
-      'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
-      'sources': [ 'binding.cc' ]
+      'sources': [ 'binding.cc' ],
+      'includes': ['../common.gypi'],
     }
   ]
 }
diff --git a/test/addons/hello-world-function-export/binding.gyp b/test/addons/hello-world-function-export/binding.gyp
@@ -2,8 +2,8 @@
   'targets': [
     {
       'target_name': 'binding',
-      'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
-      'sources': [ 'binding.cc' ]
+      'sources': [ 'binding.cc' ],
+      'includes': ['../common.gypi'],
     }
   ]
 }
diff --git a/test/addons/hello-world/binding.gyp b/test/addons/hello-world/binding.gyp
@@ -2,8 +2,8 @@
   'targets': [
     {
       'target_name': 'binding',
-      'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
-      'sources': [ 'binding.cc' ]
+      'sources': [ 'binding.cc' ],
+      'includes': ['../common.gypi'],
     }
   ]
 }
diff --git a/test/addons/load-long-path/binding.gyp b/test/addons/load-long-path/binding.gyp
@@ -2,8 +2,8 @@
   'targets': [
     {
       'target_name': 'binding',
-      'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
-      'sources': [ 'binding.cc' ]
+      'sources': [ 'binding.cc' ],
+      'includes': ['../common.gypi'],
     }
   ]
 }
diff --git a/test/addons/make-callback-domain-warning/binding.gyp b/test/addons/make-callback-domain-warning/binding.gyp
@@ -2,8 +2,8 @@
   'targets': [
     {
       'target_name': 'binding',
-      'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
-      'sources': [ 'binding.cc' ]
+      'sources': [ 'binding.cc' ],
+      'includes': ['../common.gypi'],
     }
   ]
 }
diff --git a/test/addons/make-callback-recurse/binding.gyp b/test/addons/make-callback-recurse/binding.gyp
@@ -2,8 +2,8 @@
   'targets': [
     {
       'target_name': 'binding',
-      'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
-      'sources': [ 'binding.cc' ]
+      'sources': [ 'binding.cc' ],
+      'includes': ['../common.gypi'],
     }
   ]
 }
diff --git a/test/addons/make-callback/binding.gyp b/test/addons/make-callback/binding.gyp
@@ -2,8 +2,8 @@
   'targets': [
     {
       'target_name': 'binding',
-      'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
-      'sources': [ 'binding.cc' ]
+      'sources': [ 'binding.cc' ],
+      'includes': ['../common.gypi'],
     }
   ]
 }
diff --git a/test/addons/new-target/binding.gyp b/test/addons/new-target/binding.gyp
@@ -2,8 +2,8 @@
   'targets': [
     {
       'target_name': 'binding',
-      'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
-      'sources': [ 'binding.cc' ]
+      'sources': [ 'binding.cc' ],
+      'includes': ['../common.gypi'],
     }
   ]
 }
diff --git a/test/addons/node-module-version/binding.gyp b/test/addons/node-module-version/binding.gyp
@@ -2,8 +2,8 @@
   'targets': [
     {
       'target_name': 'binding',
-      'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
-      'sources': [ 'binding.cc' ]
+      'sources': [ 'binding.cc' ],
+      'includes': ['../common.gypi'],
     }
   ]
 }
diff --git a/test/addons/non-node-context/binding.gyp b/test/addons/non-node-context/binding.gyp
@@ -2,7 +2,8 @@
   'targets': [
     {
       'target_name': 'binding',
-      'sources': ['binding.cc']
+      'sources': ['binding.cc'],
+      'includes': ['../common.gypi'],
     },
   ]
 }
diff --git a/test/addons/not-a-binding/binding.gyp b/test/addons/not-a-binding/binding.gyp
@@ -2,7 +2,8 @@
   'targets': [
     {
       'target_name': 'binding',
-      'sources': [ 'not_a_binding.c' ]
+      'sources': [ 'not_a_binding.c' ],
+      'includes': ['../common.gypi'],
     }
   ]
 }
diff --git a/test/addons/null-buffer-neuter/binding.gyp b/test/addons/null-buffer-neuter/binding.gyp
@@ -2,8 +2,8 @@
   'targets': [
     {
       'target_name': 'binding',
-      'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
-      'sources': [ 'binding.cc' ]
+      'sources': [ 'binding.cc' ],
+      'includes': ['../common.gypi'],
     }
   ]
 }
diff --git a/test/addons/openssl-binding/binding.gyp b/test/addons/openssl-binding/binding.gyp
@@ -2,12 +2,13 @@
   'targets': [
     {
       'target_name': 'binding',
+      'includes': ['../common.gypi'],
       'conditions': [
         ['node_use_openssl=="true"', {
           'sources': ['binding.cc'],
           'include_dirs': ['../../../deps/openssl/openssl/include'],
-        }]
-      ]
+        }],
+      ],
     },
   ]
 }
diff --git a/test/addons/openssl-client-cert-engine/binding.gyp b/test/addons/openssl-client-cert-engine/binding.gyp
@@ -3,6 +3,7 @@
     {
       'target_name': 'testengine',
       'type': 'none',
+      'includes': ['../common.gypi'],
       'conditions': [
         ['OS=="mac" and '
          'node_use_openssl=="true" and '
@@ -17,7 +18,7 @@
               '../../../../out/<(PRODUCT_DIR)/<(openssl_product)'
             ]
           },
-        }]
+        }],
       ]
     }
   ]
diff --git a/test/addons/parse-encoding/binding.gyp b/test/addons/parse-encoding/binding.gyp
@@ -2,8 +2,8 @@
   'targets': [
     {
       'target_name': 'binding',
-      'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
-      'sources': [ 'binding.cc' ]
+      'sources': [ 'binding.cc' ],
+      'includes': ['../common.gypi'],
     }
   ]
 }
diff --git a/test/addons/repl-domain-abort/binding.gyp b/test/addons/repl-domain-abort/binding.gyp
@@ -2,8 +2,8 @@
   'targets': [
     {
       'target_name': 'binding',
-      'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
-      'sources': [ 'binding.cc' ]
+      'sources': [ 'binding.cc' ],
+      'includes': ['../common.gypi'],
     }
   ]
 }
diff --git a/test/addons/stringbytes-external-exceed-max/binding.gyp b/test/addons/stringbytes-external-exceed-max/binding.gyp
@@ -2,8 +2,8 @@
   'targets': [
     {
       'target_name': 'binding',
-      'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
-      'sources': [ 'binding.cc' ]
+      'sources': [ 'binding.cc' ],
+      'includes': ['../common.gypi'],
     }
   ]
 }
diff --git a/test/addons/symlinked-module/binding.gyp b/test/addons/symlinked-module/binding.gyp
@@ -2,7 +2,8 @@
   'targets': [
     {
       'target_name': 'binding',
-      'sources': [ 'binding.cc' ]
+      'sources': [ 'binding.cc' ],
+      'includes': ['../common.gypi'],
     }
   ]
 }
diff --git a/test/addons/uv-handle-leak/binding.gyp b/test/addons/uv-handle-leak/binding.gyp
@@ -2,8 +2,8 @@
   'targets': [
     {
       'target_name': 'binding',
-      'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
-      'sources': [ 'binding.cc' ]
+      'sources': [ 'binding.cc' ],
+      'includes': ['../common.gypi'],
     }
   ]
 }
diff --git a/test/addons/worker-addon/binding.gyp b/test/addons/worker-addon/binding.gyp
@@ -2,8 +2,8 @@
   'targets': [
     {
       'target_name': 'binding',
-      'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
-      'sources': [ 'binding.cc' ]
+      'sources': [ 'binding.cc' ],
+      'includes': ['../common.gypi'],
     }
   ]
 }
diff --git a/test/addons/zlib-binding/binding.gyp b/test/addons/zlib-binding/binding.gyp
@@ -4,6 +4,7 @@
       'target_name': 'binding',
       'sources': ['binding.cc'],
       'include_dirs': ['../../../deps/zlib'],
+      'includes': ['../common.gypi'],
     },
   ]
 }
diff --git a/tools/doc/addon-verify.js b/tools/doc/addon-verify.js
@@ -79,8 +79,8 @@ ${files[name].replace(
       targets: [
         {
           target_name: 'addon',
-          defines: [ 'V8_DEPRECATION_WARNINGS=1' ],
-          sources: files.map(({ name }) => name)
+          sources: files.map(({ name }) => name),
+          includes: ['../common.gypi'],
         }
       ]
     })

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`	`'targets': [`
`3`	`3`	`{`
`4`	`4`	`'target_name': 'binding',`
`5`		`- 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],`
`6`		`- 'sources': [ 'binding.cc' ]`
	`5`	`+ 'sources': [ 'binding.cc' ],`
	`6`	`+ 'includes': ['../common.gypi'],`
`7`	`7`	`}`
`8`	`8`	`]`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@`
`17`	`17`	`},`
`18`	`18`	`{`
`19`	`19`	`'target_name': 'binding',`
`20`		`- 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],`
`21`	`20`	`'sources': [ 'binding.cc' ],`
	`21`	`+ 'includes': ['../common.gypi'],`
`22`	`22`	`}`
`23`	`23`	`]`
`24`	`24`	`}`