From 513d9f4c9c1dc5095091cf4c7ad52e2c1f7177e0 Mon Sep 17 00:00:00 2001 From: Akos Kiss Date: Tue, 20 Sep 2016 16:20:48 +0200 Subject: [PATCH] Sync cmake and build.py defaults (#1360) * Cmake had LTO OFF, build.py had LTO ON by default. ON became the common setting. * Cmake had snapshot save/exec OFF, build.py had them ON by default. OFF became the common setting. JerryScript-DCO-1.0-Signed-off-by: Akos Kiss akiss@inf.u-szeged.hu --- CMakeLists.txt | 4 ++-- tools/build.py | 4 ++-- tools/run-tests.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5405f213e..b9d5b291d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,8 +31,8 @@ set(UNITTESTS OFF CACHE BOOL "Build unit tests?") # Optional build settings set(PORT_DIR "${CMAKE_SOURCE_DIR}/targets/default" CACHE STRING "Use default or external port?") -set(ENABLE_LTO OFF CACHE BOOL "Enable LTO build?") -set(ENABLE_ALL_IN_ONE ON CACHE BOOL "Enable all-in-one build?") +set(ENABLE_LTO ON CACHE BOOL "Enable LTO build?") +set(ENABLE_ALL_IN_ONE OFF CACHE BOOL "Enable all-in-one build?") set(ENABLE_STRIP ON CACHE BOOL "Enable stripping all symbols from release binary?") set(ENABLE_STATIC_LINK ON CACHE BOOL "Enable static linking?") diff --git a/tools/build.py b/tools/build.py index dccb266b7..6643e5fa3 100755 --- a/tools/build.py +++ b/tools/build.py @@ -51,8 +51,8 @@ def get_arguments(): parser.add_argument('--all-in-one', metavar='X', choices=['on', 'off'], default='off', help='all-in-one build (%(choices)s; default: %(default)s)') parser.add_argument('--profile', metavar='PROFILE', choices=['full', 'minimal'], default='full', help='specify the profile (%(choices)s; default: %(default)s)') parser.add_argument('--error-messages', metavar='X', choices=['on', 'off'], default='off', help='enable error messages (%(choices)s; default: %(default)s)') - parser.add_argument('--snapshot-save', metavar='X', choices=['on', 'off'], default='on', help='enable saving snapshot files (%(choices)s; default: %(default)s)') - parser.add_argument('--snapshot-exec', metavar='X', choices=['on', 'off'], default='on', help='enable executing snapshot files (%(choices)s; default: %(default)s)') + parser.add_argument('--snapshot-save', metavar='X', choices=['on', 'off'], default='off', help='enable saving snapshot files (%(choices)s; default: %(default)s)') + parser.add_argument('--snapshot-exec', metavar='X', choices=['on', 'off'], default='off', help='enable executing snapshot files (%(choices)s; default: %(default)s)') parser.add_argument('--cpointer-32bit', metavar='X', choices=['on', 'off'], default='off', help='enable 32 bit compressed pointers (%(choices)s; default: %(default)s)') parser.add_argument('--toolchain', metavar='FILE', action='store', default=default_toolchain(), help='add toolchain file (default: %(default)s)') parser.add_argument('--cmake-param', metavar='OPT', action='append', default=[], help='add custom argument to CMake') diff --git a/tools/run-tests.py b/tools/run-tests.py index e7185fc77..60d6d645f 100755 --- a/tools/run-tests.py +++ b/tools/run-tests.py @@ -62,8 +62,8 @@ class Options: # Test options for unittests jerry_unittests_options = [ - Options('unittests', ['--unittests', '--error-messages=on']), - Options('unittests-debug', ['--unittests', '--debug', '--error-messages=on']), + Options('unittests', ['--unittests', '--error-messages=on', '--snapshot-save=on', '--snapshot-exec=on']), + Options('unittests-debug', ['--unittests', '--debug', '--error-messages=on', '--snapshot-save=on', '--snapshot-exec=on']), ] # Test options for jerry-tests