commit 9c0903e27ba98ef9f382735445b662f696981c21
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jul 12 23:23:49 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 12 23:23:49 2021 +0000
tree d182c7f6d5f8e87ac59514725cf845ed31eac035
parent 356a59889b3f63826f73798f63d3ea66983a6560
parent 3f26ba39c33b2bb979906c1be73c86fbfc25b1eb

Merge "Support running Kotlin tests"

run_robotests.mk

diff --git a/run_robotests.mk b/run_robotests.mk
index 6251ae1..ba9a9c3 100644
--- a/run_robotests.mk
+++ b/run_robotests.mk
@@ -88,8 +88,9 @@
     # directory from which this module is invoked.
     ifeq ($(strip $(LOCAL_ROBOTEST_FILES)),)
         LOCAL_ROBOTEST_FILES := $(call find-files-in-subdirs,$(LOCAL_PATH)/src,*Test.java,.)
+        LOCAL_ROBOTEST_FILES += $(call find-files-in-subdirs,$(LOCAL_PATH)/src,*Test.kt,.)
     endif
-    # Convert the paths into package names by removing .java extension and replacing "/" with "."
+    # Convert the paths into package names by removing .java or *.kt extensions and replacing "/" with "."
     my_tests := $(sort $(subst /,.,$(basename $(LOCAL_ROBOTEST_FILES))))
     ifdef my_test_filter_command
         my_tests := $(sort $(shell echo '$(my_tests)' | tr ' ' '\n' | $(my_test_filter_command)))