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.
GoogleChromeLabs · Jun 5, 2018 · a68e15d · a68e15d
1 parent 33cc54b
commit a68e15d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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/...cking/user-prompting-checker-unittests.js → ...ecking/user-prompting-checker-unittest.js b/...cking/user-prompting-checker-unittests.js → ...ecking/user-prompting-checker-unittest.js