Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73b998ad authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Revert "ATest: GTest auto gen config support run-test-as.""

parents 470dacd2 a8fcf6c8

core/autogen_test_config.mk

+0 −7
Original line number Original line Diff line number Diff line
@@ -34,16 +34,9 @@ else 
endif

endif

# Auto generating test config file for native test

# Auto generating test config file for native test

$(autogen_test_config_file): PRIVATE_MODULE_NAME := $(LOCAL_MODULE)

$(autogen_test_config_file): PRIVATE_MODULE_NAME := $(LOCAL_MODULE)

$(autogen_test_config_file): PRIVATE_RUN_UID := $(LOCAL_RUN_TEST_AS)

$(autogen_test_config_file) : $(autogen_test_config_template)

$(autogen_test_config_file) : $(autogen_test_config_template)

	@echo "Auto generating test config $(notdir $@)"

	@echo "Auto generating test config $(notdir $@)"

	$(hide) sed 's&{MODULE}&$(PRIVATE_MODULE_NAME)&g' $< > $@

	$(hide) sed 's&{MODULE}&$(PRIVATE_MODULE_NAME)&g' $< > $@

ifneq ($(LOCAL_RUN_TEST_AS),)

	$(hide) sed -i 's&{UID_OPTION}&<option name="run-test-as" value="$(PRIVATE_RUN_UID)" />&g' $@

else

	$(hide) sed -i '/{UID_OPTION}/d' $@

endif



my_auto_generate_config := true

my_auto_generate_config := true

else

else

# Auto generating test config file for instrumentation test

# Auto generating test config file for instrumentation test

core/clear_vars.mk

+0 −1
Original line number Original line Diff line number Diff line
@@ -245,7 +245,6 @@ LOCAL_RESOURCE_DIR:= 
LOCAL_RMTYPEDEFS:=

LOCAL_RMTYPEDEFS:=

LOCAL_RRO_THEME:=

LOCAL_RRO_THEME:=

LOCAL_RTTI_FLAG:=

LOCAL_RTTI_FLAG:=

LOCAL_RUN_TEST_AS :=

LOCAL_SANITIZE:=

LOCAL_SANITIZE:=

LOCAL_SANITIZE_DIAG:=

LOCAL_SANITIZE_DIAG:=

LOCAL_SANITIZE_RECOVER:=

LOCAL_SANITIZE_RECOVER:=

core/native_test_config_template.xml

+0 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,6 @@ 
    </target_preparer>

    </target_preparer>





    <test class="com.android.tradefed.testtype.GTest" >

    <test class="com.android.tradefed.testtype.GTest" >

        {UID_OPTION}

        <option name="native-test-device-path" value="/data/local/tmp" />

        <option name="native-test-device-path" value="/data/local/tmp" />

        <option name="module-name" value="{MODULE}" />

        <option name="module-name" value="{MODULE}" />

    </test>

    </test>