Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: turn warnings into errors for node sources #32685

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
'uv_library%': 'static_library',

'clang%': 0,
'error_on_warn%': 'false',

'openssl_fips%': '',
'openssl_no_asm%': 0,
Expand Down Expand Up @@ -218,7 +219,14 @@
# Forcibly disable -Werror. We support a wide range of compilers, it's
# simply not feasible to squelch all warnings, never mind that the
# libraries in deps/ are not under our control.
'cflags!': ['-Werror'],
'conditions': [
[ 'error_on_warn=="false"', {
danbev marked this conversation as resolved.
Show resolved Hide resolved
'cflags!': ['-Werror'],
}, '(_target_name!="<(node_lib_target_name)" or '
'_target_name!="<(node_core_target_name)")', {
'cflags!': ['-Werror'],
}],
],
'msvs_settings': {
'VCCLCompilerTool': {
'BufferSecurityCheck': 'true',
Expand Down
6 changes: 6 additions & 0 deletions configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,11 @@
choices=valid_os,
help='operating system to build for ({0})'.format(', '.join(valid_os)))

parser.add_option('--error-on-warn',
action='store_true',
dest='error_on_warn',
help='Turn compiler warnings into errors for node core sources.')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be great to have this in the Windows vcbuild.bat also.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I agree. The problem for me is that I don't have a windows testing environment anymore. At least if this got merged we could enable this for pull requests.


parser.add_option('--gdb',
action='store_true',
dest='gdb',
Expand Down Expand Up @@ -1018,6 +1023,7 @@ def configure_node(o):
o['variables']['node_install_npm'] = b(not options.without_npm)
o['variables']['debug_node'] = b(options.debug_node)
o['default_configuration'] = 'Debug' if options.debug else 'Release'
o['variables']['error_on_warn'] = b(options.error_on_warn)

host_arch = host_arch_win() if os.name == 'nt' else host_arch_cc()
target_arch = options.dest_cpu or host_arch
Expand Down
6 changes: 6 additions & 0 deletions node.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,9 @@
'msvs_disabled_warnings!': [4244],

'conditions': [
[ 'error_on_warn=="true"', {
danbev marked this conversation as resolved.
Show resolved Hide resolved
'cflags': ['-Werror'],
}],
[ 'node_intermediate_lib_type=="static_library" and '
'node_shared=="true" and OS=="aix"', {
# For AIX, shared lib is linked by static lib and .exp. In the
Expand Down Expand Up @@ -749,6 +752,9 @@
'msvs_disabled_warnings!': [4244],

'conditions': [
[ 'error_on_warn=="true"', {
'cflags': ['-Werror'],
}],
[ 'node_builtin_modules_path!=""', {
'defines': [ 'NODE_BUILTIN_MODULES_PATH="<(node_builtin_modules_path)"' ]
}],
Expand Down
4 changes: 2 additions & 2 deletions tools/inspector_protocol/lib/Values_cpp.template
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@ std::unique_ptr<Value> DictionaryValue::clone() const
DCHECK(value != m_data.cend() && value->second);
result->setValue(key, value->second->clone());
}
return std::move(result);
return result;
}

DictionaryValue::DictionaryValue()
Expand Down Expand Up @@ -647,7 +647,7 @@ std::unique_ptr<Value> ListValue::clone() const
std::unique_ptr<ListValue> result = ListValue::create();
for (const std::unique_ptr<protocol::Value>& value : m_data)
result->pushValue(value->clone());
return std::move(result);
return result;
}

ListValue::ListValue()
Expand Down