From a68e15d24a543bcc64f43695c7f9b6c7fbbc97b7 Mon Sep 17 00:00:00 2001 From: Maksim Ivanov Date: Tue, 5 Jun 2018 17:52:30 +0200 Subject: [PATCH] Fix building of test files. Don't include test files (user-prompting-checker-unittest.js) into non-test builds. Also fix the test file naming. --- .../naclport/server_clients_management/build/Makefile | 2 +- .../server_clients_management/build/js_unittests/Makefile | 7 +++---- .../naclport/server_clients_management/include.mk | 7 ++++++- ...ker-unittests.js => user-prompting-checker-unittest.js} | 0 4 files changed, 10 insertions(+), 6 deletions(-) rename third_party/pcsc-lite/naclport/server_clients_management/src/permissions_checking/{user-prompting-checker-unittests.js => user-prompting-checker-unittest.js} (100%) diff --git a/third_party/pcsc-lite/naclport/server_clients_management/build/Makefile b/third_party/pcsc-lite/naclport/server_clients_management/build/Makefile index 1174917f5..5f7d6f184 100644 --- a/third_party/pcsc-lite/naclport/server_clients_management/build/Makefile +++ b/third_party/pcsc-lite/naclport/server_clients_management/build/Makefile @@ -73,7 +73,7 @@ $(eval $(call COPY_TO_OUT_DIR_RULE,$(SOURCES_PATH)/permissions_checking/user-pro JS_COMPILER_INPUT_PATHS := \ $(JS_COMMON_JS_COMPILER_INPUT_DIR_PATHS) \ - $(SOURCES_PATH) \ + $(PCSC_LITE_SERVER_CLIENTS_MANAGEMENT_JS_COMPILER_INPUT_DIR_PATHS) \ $(eval $(call BUILD_JS_SCRIPT,pcsc_lite_server_clients_management/user-prompt-dialog.js,$(JS_COMPILER_INPUT_PATHS),GoogleSmartCard.PcscLiteServerClientsManagement.PermissionsChecking.UserPromptDialog.Main)) diff --git a/third_party/pcsc-lite/naclport/server_clients_management/build/js_unittests/Makefile b/third_party/pcsc-lite/naclport/server_clients_management/build/js_unittests/Makefile index 2f031e68f..b3b77da80 100644 --- a/third_party/pcsc-lite/naclport/server_clients_management/build/js_unittests/Makefile +++ b/third_party/pcsc-lite/naclport/server_clients_management/build/js_unittests/Makefile @@ -31,12 +31,11 @@ include ../../include.mk # Compile all JavaScript files rooting in the tested component's directory # (including test files), and also compile the common library files (excluding -# this library's test files). +# that library's test files). # # The path constants used below come from the include.mk files. JS_COMPILER_INPUT_PATHS := \ - $(PCSC_LITE_SERVER_CLIENTS_MANAGEMENT_JS_COMPILER_INPUT_DIR_PATHS) \ - $(JS_COMMON_SOURCES_PATH) \ - !$(JS_COMMON_SOURCES_PATH)/**-unittest.js \ + $(PCSC_LITE_SERVER_CLIENTS_MANAGEMENT_SOURCES_PATH) \ + $(JS_COMMON_JS_COMPILER_INPUT_DIR_PATHS) \ $(eval $(call BUILD_JS_UNITTESTS,$(JS_COMPILER_INPUT_PATHS))) diff --git a/third_party/pcsc-lite/naclport/server_clients_management/include.mk b/third_party/pcsc-lite/naclport/server_clients_management/include.mk index 272721cd3..bd741b2dd 100644 --- a/third_party/pcsc-lite/naclport/server_clients_management/include.mk +++ b/third_party/pcsc-lite/naclport/server_clients_management/include.mk @@ -40,10 +40,15 @@ PCSC_LITE_SERVER_CLIENTS_MANAGEMENT_DIR_PATH := \ $(THIRD_PARTY_DIR_PATH)/pcsc-lite/naclport/server_clients_management -PCSC_LITE_SERVER_CLIENTS_MANAGEMENT_JS_COMPILER_INPUT_DIR_PATHS := \ +PCSC_LITE_SERVER_CLIENTS_MANAGEMENT_SOURCES_PATH := \ $(PCSC_LITE_SERVER_CLIENTS_MANAGEMENT_DIR_PATH)/src +PCSC_LITE_SERVER_CLIENTS_MANAGEMENT_JS_COMPILER_INPUT_DIR_PATHS := \ + $(PCSC_LITE_SERVER_CLIENTS_MANAGEMENT_SOURCES_PATH) \ + !$(PCSC_LITE_SERVER_CLIENTS_MANAGEMENT_SOURCES_PATH)/**-unittest.js \ + + # # Helper target that generates the library's out directory. # diff --git a/third_party/pcsc-lite/naclport/server_clients_management/src/permissions_checking/user-prompting-checker-unittests.js b/third_party/pcsc-lite/naclport/server_clients_management/src/permissions_checking/user-prompting-checker-unittest.js similarity index 100% rename from third_party/pcsc-lite/naclport/server_clients_management/src/permissions_checking/user-prompting-checker-unittests.js rename to third_party/pcsc-lite/naclport/server_clients_management/src/permissions_checking/user-prompting-checker-unittest.js