From 43997445887cdbb4c870c1fa85a1e1be2c87e7e5 Mon Sep 17 00:00:00 2001 From: Robert Fancsik Date: Tue, 12 Jan 2021 10:47:36 +0100 Subject: [PATCH] Remove file(GLOB ...) usage from CMakeLists.txt (#4427) JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik frobert@inf.u-szeged.hu --- jerry-core/CMakeLists.txt | 351 +++++++++++++++++++++++++-- jerry-ext/CMakeLists.txt | 26 +- jerry-math/CMakeLists.txt | 37 ++- jerry-port/default/CMakeLists.txt | 13 +- tests/unit-core/CMakeLists.txt | 60 ++++- tests/unit-doc/CMakeLists.txt | 20 +- tests/unit-ext/CMakeLists.txt | 26 +- tests/unit-ext/module/CMakeLists.txt | 6 +- tests/unit-math/CMakeLists.txt | 4 +- 9 files changed, 507 insertions(+), 36 deletions(-) diff --git a/jerry-core/CMakeLists.txt b/jerry-core/CMakeLists.txt index bdb20c6c6..4d06a9b07 100644 --- a/jerry-core/CMakeLists.txt +++ b/jerry-core/CMakeLists.txt @@ -122,20 +122,191 @@ set(INCLUDE_CORE_PRIVATE ${INCLUDE_CORE_PRIVATE} PARENT_SCOPE) # for tests/unit- # Sources # Jerry core -file(GLOB SOURCE_CORE_FILES - api/*.c - debugger/*.c - ecma/base/*.c - ecma/builtin-objects/*.c - ecma/builtin-objects/typedarray/*.c - ecma/operations/*.c - jcontext/*.c - jmem/*.c - jrt/*.c - lit/*.c - parser/js/*.c - parser/regexp/*.c - vm/*.c) +set(SOURCE_CORE_FILES + api/jerry-debugger-transport.c + api/jerry-debugger.c + api/jerry-snapshot.c + api/jerry.c + debugger/debugger.c + ecma/base/ecma-alloc.c + ecma/base/ecma-gc.c + ecma/base/ecma-helpers-collection.c + ecma/base/ecma-helpers-conversion.c + ecma/base/ecma-helpers-errol.c + ecma/base/ecma-helpers-external-pointers.c + ecma/base/ecma-helpers-number.c + ecma/base/ecma-helpers-string.c + ecma/base/ecma-helpers-value.c + ecma/base/ecma-helpers.c + ecma/base/ecma-init-finalize.c + ecma/base/ecma-lcache.c + ecma/base/ecma-literal-storage.c + ecma/base/ecma-module.c + ecma/base/ecma-property-hashmap.c + ecma/builtin-objects/ecma-builtin-array-iterator-prototype.c + ecma/builtin-objects/ecma-builtin-array-prototype-unscopables.c + ecma/builtin-objects/ecma-builtin-array-prototype.c + ecma/builtin-objects/ecma-builtin-array.c + ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.c + ecma/builtin-objects/ecma-builtin-arraybuffer.c + ecma/builtin-objects/ecma-builtin-async-function-prototype.c + ecma/builtin-objects/ecma-builtin-async-function.c + ecma/builtin-objects/ecma-builtin-async-generator-function.c + ecma/builtin-objects/ecma-builtin-async-generator-prototype.c + ecma/builtin-objects/ecma-builtin-async-generator.c + ecma/builtin-objects/ecma-builtin-async-iterator-prototype.c + ecma/builtin-objects/ecma-builtin-bigint-prototype.c + ecma/builtin-objects/ecma-builtin-bigint.c + ecma/builtin-objects/ecma-builtin-boolean-prototype.c + ecma/builtin-objects/ecma-builtin-boolean.c + ecma/builtin-objects/ecma-builtin-dataview-prototype.c + ecma/builtin-objects/ecma-builtin-dataview.c + ecma/builtin-objects/ecma-builtin-date-prototype.c + ecma/builtin-objects/ecma-builtin-date.c + ecma/builtin-objects/ecma-builtin-error-prototype.c + ecma/builtin-objects/ecma-builtin-error.c + ecma/builtin-objects/ecma-builtin-evalerror-prototype.c + ecma/builtin-objects/ecma-builtin-evalerror.c + ecma/builtin-objects/ecma-builtin-function-prototype.c + ecma/builtin-objects/ecma-builtin-function.c + ecma/builtin-objects/ecma-builtin-generator-function.c + ecma/builtin-objects/ecma-builtin-generator-prototype.c + ecma/builtin-objects/ecma-builtin-generator.c + ecma/builtin-objects/ecma-builtin-global.c + ecma/builtin-objects/ecma-builtin-handlers.c + ecma/builtin-objects/ecma-builtin-helpers-date.c + ecma/builtin-objects/ecma-builtin-helpers-error.c + ecma/builtin-objects/ecma-builtin-helpers-json.c + ecma/builtin-objects/ecma-builtin-helpers-sort.c + ecma/builtin-objects/ecma-builtin-helpers.c + ecma/builtin-objects/ecma-builtin-intrinsic.c + ecma/builtin-objects/ecma-builtin-iterator-prototype.c + ecma/builtin-objects/ecma-builtin-json.c + ecma/builtin-objects/ecma-builtin-map-iterator-prototype.c + ecma/builtin-objects/ecma-builtin-map-prototype.c + ecma/builtin-objects/ecma-builtin-map.c + ecma/builtin-objects/ecma-builtin-math.c + ecma/builtin-objects/ecma-builtin-number-prototype.c + ecma/builtin-objects/ecma-builtin-number.c + ecma/builtin-objects/ecma-builtin-object-prototype.c + ecma/builtin-objects/ecma-builtin-object.c + ecma/builtin-objects/ecma-builtin-promise-prototype.c + ecma/builtin-objects/ecma-builtin-promise.c + ecma/builtin-objects/ecma-builtin-proxy.c + ecma/builtin-objects/ecma-builtin-rangeerror-prototype.c + ecma/builtin-objects/ecma-builtin-rangeerror.c + ecma/builtin-objects/ecma-builtin-referenceerror-prototype.c + ecma/builtin-objects/ecma-builtin-referenceerror.c + ecma/builtin-objects/ecma-builtin-reflect.c + ecma/builtin-objects/ecma-builtin-regexp-prototype.c + ecma/builtin-objects/ecma-builtin-regexp.c + ecma/builtin-objects/ecma-builtin-set-iterator-prototype.c + ecma/builtin-objects/ecma-builtin-set-prototype.c + ecma/builtin-objects/ecma-builtin-set.c + ecma/builtin-objects/ecma-builtin-string-iterator-prototype.c + ecma/builtin-objects/ecma-builtin-string-prototype.c + ecma/builtin-objects/ecma-builtin-string.c + ecma/builtin-objects/ecma-builtin-symbol-prototype.c + ecma/builtin-objects/ecma-builtin-symbol.c + ecma/builtin-objects/ecma-builtin-syntaxerror-prototype.c + ecma/builtin-objects/ecma-builtin-syntaxerror.c + ecma/builtin-objects/ecma-builtin-type-error-thrower.c + ecma/builtin-objects/ecma-builtin-typeerror-prototype.c + ecma/builtin-objects/ecma-builtin-typeerror.c + ecma/builtin-objects/ecma-builtin-urierror-prototype.c + ecma/builtin-objects/ecma-builtin-urierror.c + ecma/builtin-objects/ecma-builtin-weakmap-prototype.c + ecma/builtin-objects/ecma-builtin-weakmap.c + ecma/builtin-objects/ecma-builtin-weakset-prototype.c + ecma/builtin-objects/ecma-builtin-weakset.c + ecma/builtin-objects/ecma-builtins.c + ecma/builtin-objects/typedarray/ecma-builtin-bigint64array-prototype.c + ecma/builtin-objects/typedarray/ecma-builtin-bigint64array.c + ecma/builtin-objects/typedarray/ecma-builtin-biguint64array-prototype.c + ecma/builtin-objects/typedarray/ecma-builtin-biguint64array.c + ecma/builtin-objects/typedarray/ecma-builtin-float32array-prototype.c + ecma/builtin-objects/typedarray/ecma-builtin-float32array.c + ecma/builtin-objects/typedarray/ecma-builtin-float64array-prototype.c + ecma/builtin-objects/typedarray/ecma-builtin-float64array.c + ecma/builtin-objects/typedarray/ecma-builtin-int16array-prototype.c + ecma/builtin-objects/typedarray/ecma-builtin-int16array.c + ecma/builtin-objects/typedarray/ecma-builtin-int32array-prototype.c + ecma/builtin-objects/typedarray/ecma-builtin-int32array.c + ecma/builtin-objects/typedarray/ecma-builtin-int8array-prototype.c + ecma/builtin-objects/typedarray/ecma-builtin-int8array.c + ecma/builtin-objects/typedarray/ecma-builtin-typedarray-helpers.c + ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.c + ecma/builtin-objects/typedarray/ecma-builtin-typedarray.c + ecma/builtin-objects/typedarray/ecma-builtin-uint16array-prototype.c + ecma/builtin-objects/typedarray/ecma-builtin-uint16array.c + ecma/builtin-objects/typedarray/ecma-builtin-uint32array-prototype.c + ecma/builtin-objects/typedarray/ecma-builtin-uint32array.c + ecma/builtin-objects/typedarray/ecma-builtin-uint8array-prototype.c + ecma/builtin-objects/typedarray/ecma-builtin-uint8array.c + ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray-prototype.c + ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray.c + ecma/operations/ecma-arguments-object.c + ecma/operations/ecma-array-object.c + ecma/operations/ecma-arraybuffer-object.c + ecma/operations/ecma-async-generator-object.c + ecma/operations/ecma-big-uint.c + ecma/operations/ecma-bigint-object.c + ecma/operations/ecma-bigint.c + ecma/operations/ecma-boolean-object.c + ecma/operations/ecma-comparison.c + ecma/operations/ecma-container-object.c + ecma/operations/ecma-conversion.c + ecma/operations/ecma-dataview-object.c + ecma/operations/ecma-eval.c + ecma/operations/ecma-exceptions.c + ecma/operations/ecma-function-object.c + ecma/operations/ecma-get-put-value.c + ecma/operations/ecma-iterator-object.c + ecma/operations/ecma-jobqueue.c + ecma/operations/ecma-lex-env.c + ecma/operations/ecma-number-arithmetic.c + ecma/operations/ecma-number-object.c + ecma/operations/ecma-objects-general.c + ecma/operations/ecma-objects.c + ecma/operations/ecma-promise-object.c + ecma/operations/ecma-proxy-object.c + ecma/operations/ecma-reference.c + ecma/operations/ecma-regexp-object.c + ecma/operations/ecma-string-object.c + ecma/operations/ecma-symbol-object.c + ecma/operations/ecma-typedarray-object.c + jcontext/jcontext.c + jmem/jmem-allocator.c + jmem/jmem-heap.c + jmem/jmem-poolman.c + jrt/jrt-fatals.c + lit/lit-char-helpers.c + lit/lit-magic-strings.c + lit/lit-strings.c + parser/js/byte-code.c + parser/js/common.c + parser/js/js-lexer.c + parser/js/js-parser-expr.c + parser/js/js-parser-mem.c + parser/js/js-parser-module.c + parser/js/js-parser-statm.c + parser/js/js-parser-tagged-template-literal.c + parser/js/js-parser-util.c + parser/js/js-parser.c + parser/js/js-scanner-ops.c + parser/js/js-scanner-util.c + parser/js/js-scanner.c + parser/regexp/re-bytecode.c + parser/regexp/re-compiler.c + parser/regexp/re-parser.c + vm/opcodes-ecma-arithmetics.c + vm/opcodes-ecma-bitwise.c + vm/opcodes-ecma-relational-equality.c + vm/opcodes.c + vm/vm-stack.c + vm/vm-utils.c + vm/vm.c +) # Amalgamated JerryScript source/header build. # The process will create the following files: @@ -145,7 +316,157 @@ file(GLOB SOURCE_CORE_FILES if(ENABLE_AMALGAM) # Create single C/H file - file(GLOB HEADER_CORE_FILES *.h) + set(HEADER_CORE_FILES + api/jerry-snapshot.h + debugger/debugger.h + ecma/base/ecma-alloc.h + ecma/base/ecma-gc.h + ecma/base/ecma-globals.h + ecma/base/ecma-helpers.h + ecma/base/ecma-init-finalize.h + ecma/base/ecma-lcache.h + ecma/base/ecma-literal-storage.h + ecma/base/ecma-module.h + ecma/base/ecma-property-hashmap.h + ecma/builtin-objects/ecma-builtin-arraybuffer.inc.h + ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.inc.h + ecma/builtin-objects/ecma-builtin-array.inc.h + ecma/builtin-objects/ecma-builtin-array-iterator-prototype.inc.h + ecma/builtin-objects/ecma-builtin-array-prototype.inc.h + ecma/builtin-objects/ecma-builtin-array-prototype-unscopables.inc.h + ecma/builtin-objects/ecma-builtin-async-function.inc.h + ecma/builtin-objects/ecma-builtin-async-function-prototype.inc.h + ecma/builtin-objects/ecma-builtin-async-generator-function.inc.h + ecma/builtin-objects/ecma-builtin-async-generator.inc.h + ecma/builtin-objects/ecma-builtin-async-generator-prototype.inc.h + ecma/builtin-objects/ecma-builtin-async-iterator-prototype.inc.h + ecma/builtin-objects/ecma-builtin-bigint.inc.h + ecma/builtin-objects/ecma-builtin-bigint-prototype.inc.h + ecma/builtin-objects/ecma-builtin-boolean.inc.h + ecma/builtin-objects/ecma-builtin-boolean-prototype.inc.h + ecma/builtin-objects/ecma-builtin-dataview.inc.h + ecma/builtin-objects/ecma-builtin-dataview-prototype.inc.h + ecma/builtin-objects/ecma-builtin-date.inc.h + ecma/builtin-objects/ecma-builtin-date-prototype.inc.h + ecma/builtin-objects/ecma-builtin-error.inc.h + ecma/builtin-objects/ecma-builtin-error-prototype.inc.h + ecma/builtin-objects/ecma-builtin-evalerror.inc.h + ecma/builtin-objects/ecma-builtin-evalerror-prototype.inc.h + ecma/builtin-objects/ecma-builtin-function.inc.h + ecma/builtin-objects/ecma-builtin-function-prototype.h + ecma/builtin-objects/ecma-builtin-function-prototype.inc.h + ecma/builtin-objects/ecma-builtin-generator-function.inc.h + ecma/builtin-objects/ecma-builtin-generator.inc.h + ecma/builtin-objects/ecma-builtin-generator-prototype.inc.h + ecma/builtin-objects/ecma-builtin-global.inc.h + ecma/builtin-objects/ecma-builtin-handlers.h + ecma/builtin-objects/ecma-builtin-handlers.inc.h + ecma/builtin-objects/ecma-builtin-helpers.h + ecma/builtin-objects/ecma-builtin-helpers-macro-defines.inc.h + ecma/builtin-objects/ecma-builtin-helpers-macro-undefs.inc.h + ecma/builtin-objects/ecma-builtin-internal-routines-template.inc.h + ecma/builtin-objects/ecma-builtin-intrinsic.inc.h + ecma/builtin-objects/ecma-builtin-iterator-prototype.inc.h + ecma/builtin-objects/ecma-builtin-json.inc.h + ecma/builtin-objects/ecma-builtin-map.inc.h + ecma/builtin-objects/ecma-builtin-map-iterator-prototype.inc.h + ecma/builtin-objects/ecma-builtin-map-prototype.inc.h + ecma/builtin-objects/ecma-builtin-math.inc.h + ecma/builtin-objects/ecma-builtin-number.inc.h + ecma/builtin-objects/ecma-builtin-number-prototype.inc.h + ecma/builtin-objects/ecma-builtin-object.h + ecma/builtin-objects/ecma-builtin-object.inc.h + ecma/builtin-objects/ecma-builtin-object-prototype.inc.h + ecma/builtin-objects/ecma-builtin-promise.inc.h + ecma/builtin-objects/ecma-builtin-promise-prototype.inc.h + ecma/builtin-objects/ecma-builtin-proxy.inc.h + ecma/builtin-objects/ecma-builtin-rangeerror.inc.h + ecma/builtin-objects/ecma-builtin-rangeerror-prototype.inc.h + ecma/builtin-objects/ecma-builtin-referenceerror.inc.h + ecma/builtin-objects/ecma-builtin-referenceerror-prototype.inc.h + ecma/builtin-objects/ecma-builtin-reflect.inc.h + ecma/builtin-objects/ecma-builtin-regexp.inc.h + ecma/builtin-objects/ecma-builtin-regexp-prototype.inc.h + ecma/builtin-objects/ecma-builtin-set.inc.h + ecma/builtin-objects/ecma-builtin-set-iterator-prototype.inc.h + ecma/builtin-objects/ecma-builtin-set-prototype.inc.h + ecma/builtin-objects/ecma-builtins.h + ecma/builtin-objects/ecma-builtins.inc.h + ecma/builtin-objects/ecma-builtins-internal.h + ecma/builtin-objects/ecma-builtin-string.inc.h + ecma/builtin-objects/ecma-builtin-string-iterator-prototype.inc.h + ecma/builtin-objects/ecma-builtin-string-prototype.inc.h + ecma/builtin-objects/ecma-builtin-symbol.inc.h + ecma/builtin-objects/ecma-builtin-symbol-prototype.inc.h + ecma/builtin-objects/ecma-builtin-syntaxerror.inc.h + ecma/builtin-objects/ecma-builtin-syntaxerror-prototype.inc.h + ecma/builtin-objects/ecma-builtin-typeerror.inc.h + ecma/builtin-objects/ecma-builtin-typeerror-prototype.inc.h + ecma/builtin-objects/ecma-builtin-type-error-thrower.inc.h + ecma/builtin-objects/ecma-builtin-urierror.inc.h + ecma/builtin-objects/ecma-builtin-urierror-prototype.inc.h + ecma/builtin-objects/ecma-builtin-weakmap.inc.h + ecma/builtin-objects/ecma-builtin-weakmap-prototype.inc.h + ecma/builtin-objects/ecma-builtin-weakset.inc.h + ecma/builtin-objects/ecma-builtin-weakset-prototype.inc.h + ecma/operations/ecma-arguments-object.h + ecma/operations/ecma-arraybuffer-object.h + ecma/operations/ecma-array-object.h + ecma/operations/ecma-async-generator-object.h + ecma/operations/ecma-bigint.h + ecma/operations/ecma-bigint-object.h + ecma/operations/ecma-big-uint.h + ecma/operations/ecma-boolean-object.h + ecma/operations/ecma-comparison.h + ecma/operations/ecma-container-object.h + ecma/operations/ecma-conversion.h + ecma/operations/ecma-dataview-object.h + ecma/operations/ecma-eval.h + ecma/operations/ecma-exceptions.h + ecma/operations/ecma-function-object.h + ecma/operations/ecma-iterator-object.h + ecma/operations/ecma-jobqueue.h + ecma/operations/ecma-lex-env.h + ecma/operations/ecma-number-arithmetic.h + ecma/operations/ecma-number-object.h + ecma/operations/ecma-objects-general.h + ecma/operations/ecma-objects.h + ecma/operations/ecma-promise-object.h + ecma/operations/ecma-proxy-object.h + ecma/operations/ecma-reference.h + ecma/operations/ecma-regexp-object.h + ecma/operations/ecma-string-object.h + ecma/operations/ecma-symbol-object.h + ecma/operations/ecma-typedarray-object.h + include/jerryscript-compiler.h + include/jerryscript-core.h + include/jerryscript-debugger.h + include/jerryscript-debugger-transport.h + include/jerryscript.h + include/jerryscript-port.h + include/jerryscript-snapshot.h + jcontext/jcontext.h + jmem/jmem-allocator-internal.h + jmem/jmem.h + jrt/jrt-bit-fields.h + jrt/jrt.h + jrt/jrt-libc-includes.h + jrt/jrt-types.h + lit/lit-char-helpers.h + lit/lit-globals.h + lit/lit-magic-strings.h + lit/lit-magic-strings.inc.h + lit/lit-strings.h + lit/lit-unicode-conversions.inc.h + lit/lit-unicode-conversions-sup.inc.h + lit/lit-unicode-folding.inc.h + lit/lit-unicode-ranges.inc.h + lit/lit-unicode-ranges-sup.inc.h + vm/opcodes.h + vm/vm-defines.h + vm/vm.h + vm/vm-stack.h + ) # Generated files set(AMALGAM_CORE_C "${CMAKE_BINARY_DIR}/amalgam/jerryscript.c") diff --git a/jerry-ext/CMakeLists.txt b/jerry-ext/CMakeLists.txt index a1caae107..af26b5e37 100644 --- a/jerry-ext/CMakeLists.txt +++ b/jerry-ext/CMakeLists.txt @@ -33,13 +33,25 @@ if(FEATURE_INIT_FINI) endif() # Source directories -file(GLOB SOURCE_EXT - arg/*.c - common/*.c - debugger/*.c - handle-scope/*.c - handler/*.c - module/*.c) +set(SOURCE_EXT + arg/arg-js-iterator-helper.c + arg/arg-transform-functions.c + arg/arg.c + debugger/debugger-common.c + debugger/debugger-rp.c + debugger/debugger-serial.c + debugger/debugger-sha1.c + debugger/debugger-tcp.c + debugger/debugger-ws.c + handle-scope/handle-scope-allocator.c + handle-scope/handle-scope.c + handler/handler-assert.c + handler/handler-gc.c + handler/handler-print.c + handler/handler-register.c + handler/handler-resource-name.c + module/module.c +) add_library(${JERRY_EXT_NAME} ${SOURCE_EXT}) diff --git a/jerry-math/CMakeLists.txt b/jerry-math/CMakeLists.txt index e7ecc6f84..b75bf93b8 100644 --- a/jerry-math/CMakeLists.txt +++ b/jerry-math/CMakeLists.txt @@ -28,14 +28,47 @@ set(COMPILE_FLAGS_MATH "${COMPILE_FLAGS_MATH} -Wno-strict-aliasing") set(INCLUDE_MATH "${CMAKE_CURRENT_SOURCE_DIR}/include") # Source directories -file(GLOB SOURCE_MATH *.c) +set(SOURCE_MATH + acos.c + acosh.c + asin.c + asinh.c + atan.c + atan2.c + atanh.c + cbrt.c + ceil.c + copysign.c + cosh.c + exp.c + expm1.c + fabs.c + finite.c + floor.c + fmod.c + isnan.c + log.c + log10.c + log1p.c + log2.c + nextafter.c + pow.c + scalbn.c + sinh.c + sqrt.c + tanh.c + trig.c +) # Amalgamated JerryScript source/header build. # The process will create the following files: # * jerryscript-math.c # * math.h if(ENABLE_AMALGAM) - file(GLOB HEADER_MATH *.h) + set(HEADER_MATH + include/math.h + jerry-math-internal.h + ) set(AMALGAM_MATH_C "${CMAKE_BINARY_DIR}/amalgam/jerryscript-math.c") set(AMALGAM_MATH_H "${CMAKE_BINARY_DIR}/amalgam/math.h") diff --git a/jerry-port/default/CMakeLists.txt b/jerry-port/default/CMakeLists.txt index 2bf44ea6d..cdaacd427 100644 --- a/jerry-port/default/CMakeLists.txt +++ b/jerry-port/default/CMakeLists.txt @@ -20,14 +20,23 @@ project (${JERRY_PORT_DEFAULT_NAME} C) set(INCLUDE_PORT_DEFAULT "${CMAKE_CURRENT_SOURCE_DIR}/include") # Source directories -file(GLOB SOURCE_PORT_DEFAULT *.c) +set(SOURCE_PORT_DEFAULT + default-date.c + default-debugger.c + default-external-context.c + default-fatal.c + default-io.c + default-module.c +) # Amalgamated JerryScript source/header build. # The process will create the following files: # * jerryscript-port-default.c # * jerryscript-port-default.h if(ENABLE_AMALGAM) - file(GLOB HEADER_PORT_DEFAULT *.h) + set(HEADER_PORT_DEFAULT + include/jerryscript-port-default.h + ) set(AMALGAM_PORT_C "${CMAKE_BINARY_DIR}/amalgam/jerryscript-port-default.c") set(AMALGAM_PORT_H "${CMAKE_BINARY_DIR}/amalgam/jerryscript-port-default.h") diff --git a/tests/unit-core/CMakeLists.txt b/tests/unit-core/CMakeLists.txt index cc71e212d..c5517fd46 100644 --- a/tests/unit-core/CMakeLists.txt +++ b/tests/unit-core/CMakeLists.txt @@ -24,7 +24,65 @@ if(${FEATURE_PROFILE} STREQUAL "${CMAKE_SOURCE_DIR}/jerry-core/profiles/minimal. endif() # Unit tests main modules -file(GLOB SOURCE_UNIT_TEST_MAIN_MODULES *.c) +set(SOURCE_UNIT_TEST_MAIN_MODULES + test-has-property.c + test-api-objecttype.c + test-strings.c + test-exec-stop.c + test-api-functiontype.c + test-external-string.c + test-from-property-descriptor.c + test-dataview.c + test-api-errortype.c + test-arraybuffer.c + test-api-object-property-names.c + test-to-integer.c + test-regression-3588.c + test-number-converter.c + test-api-value-type.c + test-jmem.c + test-promise.c + test-realm.c + test-internal-properties.c + test-abort.c + test-api-promise.c + test-context-data.c + test-backtrace.c + test-objects-foreach.c + test-api-binary-operations-arithmetics.c + test-api-binary-operations-comparisons.c + test-to-length.c + test-api-strings.c + test-proxy.c + test-container.c + test-api-binary-operations-instanceof.c + test-snapshot.c + test-native-callback-nested.c + test-lit-char-helpers.c + test-resource-name.c + test-unicode.c + test-bigint.c + test-api-property.c + test-api-iteratortype.c + test-api.c + test-typedarray.c + test-api-set-and-clear-error-flag.c + test-json.c + test-native-instanceof.c + test-literal-storage.c + test-mem-stats.c + test-newtarget.c + test-number-to-int32.c + test-number-to-string.c + test-string-to-number.c + test-poolman.c + test-regexp-dotall-unicode.c + test-date-helpers.c + test-regexp.c + test-stringbuilder.c + test-symbol.c + test-to-property-descriptor.c +) # jerry_heap_stats_t.size == 0 if system allocator is used. if(JERRY_SYSTEM_ALLOCATOR) diff --git a/tests/unit-doc/CMakeLists.txt b/tests/unit-doc/CMakeLists.txt index 5b8aa49ae..f9947caff 100644 --- a/tests/unit-doc/CMakeLists.txt +++ b/tests/unit-doc/CMakeLists.txt @@ -17,7 +17,25 @@ project (unit-doc C) find_package(PythonInterp REQUIRED) set(GEN_DOCTEST "${CMAKE_SOURCE_DIR}/tools/gen-doctest.py") -file(GLOB DOC_FILES "${CMAKE_SOURCE_DIR}/docs/*.md") +set(DOC_FILES + "${CMAKE_SOURCE_DIR}/docs/00.GETTING-STARTED.md" + "${CMAKE_SOURCE_DIR}/docs/01.CONFIGURATION.md" + "${CMAKE_SOURCE_DIR}/docs/02.API-REFERENCE.md" + "${CMAKE_SOURCE_DIR}/docs/03.API-EXAMPLE.md" + "${CMAKE_SOURCE_DIR}/docs/04.INTERNALS.md" + "${CMAKE_SOURCE_DIR}/docs/05.PORT-API.md" + "${CMAKE_SOURCE_DIR}/docs/06.REFERENCE-COUNTING.md" + "${CMAKE_SOURCE_DIR}/docs/07.DEBUGGER.md" + "${CMAKE_SOURCE_DIR}/docs/08.CODING-STANDARDS.md" + "${CMAKE_SOURCE_DIR}/docs/09.EXT-REFERENCE-ARG.md" + "${CMAKE_SOURCE_DIR}/docs/10.EXT-REFERENCE-HANDLER.md" + "${CMAKE_SOURCE_DIR}/docs/11.EXT-REFERENCE-AUTORELEASE.md" + "${CMAKE_SOURCE_DIR}/docs/12.EXT-REFERENCE-MODULE.md" + "${CMAKE_SOURCE_DIR}/docs/13.DEBUGGER-TRANSPORT.md" + "${CMAKE_SOURCE_DIR}/docs/14.EXT-REFERENCE-HANDLE-SCOPE.md" + "${CMAKE_SOURCE_DIR}/docs/15.MODULE-SYSTEM.md" + "${CMAKE_SOURCE_DIR}/docs/16.MIGRATION-GUIDE.md" +) if(NOT (${CMAKE_C_COMPILER_ID} STREQUAL MSVC)) set(COMPILE_FLAGS_DOCTEST "-Wno-unused-parameter -Wno-unused-function -Wno-unused-variable") diff --git a/tests/unit-ext/CMakeLists.txt b/tests/unit-ext/CMakeLists.txt index 9bfd41f91..6c6c0b88d 100644 --- a/tests/unit-ext/CMakeLists.txt +++ b/tests/unit-ext/CMakeLists.txt @@ -18,7 +18,20 @@ project (unit-ext C) set(INCLUDE_UNIT_EXT ${CMAKE_CURRENT_SOURCE_DIR}) # Unit tests main modules -file(GLOB SOURCE_UNIT_TEST_EXT_MODULES *.c) +set(SOURCE_UNIT_TEST_EXT_MODULES + test-ext-arg.c + test-ext-handle-scope-handle-prelist.c + test-ext-module-empty.c + test-ext-autorelease.c + test-ext-handle-scope-nested.c + test-ext-handle-scope.c + test-ext-handle-scope-escape.c + test-ext-method-register.c + test-ext-handle-scope-handle-prelist-escape.c + test-ext-handle-scope-remove.c + test-ext-handle-scope-root.c + test-ext-module-canonical.c +) # Disable test-ext-autorelease.c if compiler is MSVC, because MSVC doesn't support cleanup attribute. if(USING_MSVC) @@ -41,9 +54,10 @@ foreach(SOURCE_UNIT_TEST_EXT ${SOURCE_UNIT_TEST_EXT_MODULES}) add_dependencies(unittests-ext ${TARGET_NAME}) endforeach() -file(GLOB CONTENTS_UNIT_TEST_EXT *) -foreach(CONTENT_UNIT_TEST_EXT ${CONTENTS_UNIT_TEST_EXT}) - if(IS_DIRECTORY ${CONTENT_UNIT_TEST_EXT}) - add_subdirectory(${CONTENT_UNIT_TEST_EXT}) - endif() +set(UNIT_TEST_EXT_DIRS + module +) + +foreach(UNIT_TEST_EXT_DIR ${UNIT_TEST_EXT_DIRS}) + add_subdirectory(${UNIT_TEST_EXT_DIR}) endforeach() diff --git a/tests/unit-ext/module/CMakeLists.txt b/tests/unit-ext/module/CMakeLists.txt index eed0c998b..b9301c1b7 100644 --- a/tests/unit-ext/module/CMakeLists.txt +++ b/tests/unit-ext/module/CMakeLists.txt @@ -16,7 +16,11 @@ cmake_minimum_required (VERSION 2.8.12) set(JERRYX_MODULE_UNITTEST_NAME unit-test-jerry-module) project (${JERRYX_MODULE_UNITTEST_NAME} C) -file(GLOB JERRYX_MODULE_UNIT_TEST_SOURCES *.c) +set(JERRYX_MODULE_UNIT_TEST_SOURCES + jerry-module-test.c + my-broken-module.c + my-custom-module.c +) if (FEATURE_INIT_FINI) set(DEFINES_JERRYX_MODULE_UNITTEST ${DEFINES_JERRYX_MODULE_UNITTEST} ENABLE_INIT_FINI) diff --git a/tests/unit-math/CMakeLists.txt b/tests/unit-math/CMakeLists.txt index 0d7c9da36..d456731d4 100644 --- a/tests/unit-math/CMakeLists.txt +++ b/tests/unit-math/CMakeLists.txt @@ -16,7 +16,9 @@ cmake_minimum_required (VERSION 2.8.12) project (unit-math C) # Unit tests main modules -file(GLOB SOURCE_UNIT_TEST_MAIN_MODULES *.c) +set(SOURCE_UNIT_TEST_MAIN_MODULES + test-math.c +) # Unit tests declaration add_custom_target(unittests-math)