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

Commit 4d8ed917 authored by Felipe Leme's avatar Felipe Leme Committed by android-build-merger
Browse files

Merge "Fixed dumpstate_test_fixture so it runs on 64 bits as well." into oc-mr1-dev am: a2639d47 

am: 83a4bd5c

Change-Id: I51e626ee874009a95eb1e03b6c8af9313fc8db9a
parents ce20bb1b 83a4bd5c

cmds/dumpstate/Android.mk

+1 −26
Original line number Diff line number Diff line
@@ -17,31 +17,6 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk 
LOCAL_SRC_FILES := \

        tests/dumpstate_test_fixture.cpp



LOCAL_MODULE_CLASS := NATIVE_TESTS



dumpstate_tests_intermediates := $(local-intermediates-dir)/DATA

dumpstate_tests_subpath_from_data := nativetest/dumpstate_test_fixture

dumpstate_tests_root_in_device := /data/$(dumpstate_tests_subpath_from_data)

dumpstate_tests_root_for_test_zip := $(dumpstate_tests_intermediates)/$(dumpstate_tests_subpath_from_data)

testdata_files := $(call find-subdir-files, testdata/*)



# Copy test data files to intermediates/DATA for use with LOCAL_PICKUP_FILES

GEN := $(addprefix $(dumpstate_tests_root_for_test_zip)/, $(testdata_files))

$(GEN): PRIVATE_PATH := $(LOCAL_PATH)

$(GEN): PRIVATE_CUSTOM_TOOL = cp $< $@

$(GEN): $(dumpstate_tests_root_for_test_zip)/testdata/% : $(LOCAL_PATH)/testdata/%

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



# Copy test data files again to $OUT/data so the tests can be run with adb sync

# TODO: the build system should do this automatically

GEN := $(addprefix $(TARGET_OUT_DATA)/$(dumpstate_tests_subpath_from_data)/, $(testdata_files))

$(GEN): PRIVATE_PATH := $(LOCAL_PATH)

$(GEN): PRIVATE_CUSTOM_TOOL = cp $< $@

$(GEN): $(TARGET_OUT_DATA)/$(dumpstate_tests_subpath_from_data)/testdata/% : $(LOCAL_PATH)/testdata/%

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



LOCAL_PICKUP_FILES := $(dumpstate_tests_intermediates)

LOCAL_TEST_DATA := $(call find-test-data-in-subdirs, $(LOCAL_PATH), *, tests/testdata)



include $(BUILD_NATIVE_TEST)

cmds/dumpstate/tests/dumpstate_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ class DumpstateBaseTest : public Test { 
  protected:

    const std::string kTestPath = dirname(android::base::GetExecutablePath().c_str());

    const std::string kFixturesPath = kTestPath + "/../dumpstate_test_fixture/";

    const std::string kTestDataPath = kFixturesPath + "/testdata/";

    const std::string kTestDataPath = kFixturesPath + "tests/testdata/";

    const std::string kSimpleCommand = kFixturesPath + "dumpstate_test_fixture";

    const std::string kEchoCommand = "/system/bin/echo";