Commit f90b734c authored Aug 28, 2018 by yangbill Committed by Bill Yang Aug 30, 2018

ATest: Change module_name from list to single string.

ATest's original module_name is designed as a single string.
The different type maybe cause some problem when loading module_name
data. Due to it expected it as a list but actually it will be a single
string after mod-info obj handling this data.

Bug: 113317515
Test: atest aapt2_tests
      atest hello_world_test
      atest BluetoothInstrumentationTests
      atest packages/apps/Bluetooth/tests/unit/Android.mk
      atest RunBluetoothRoboTests
      atest com.android.bluetooth
      atest libcore/luni/src/test/java/libcore/javax/net/ssl/SSLSocketTest.java
        Multiple tests found:
	  0: libjavacore-unit-tests
          1: jsr166-tests
          2: core-ojtests-public
	  ...
      atest SSLSocketTest # Brings up 2 prompts, one for which file then one for which module
      make -j bit
      bit Settings
      bit hello_world_test
      bit BluetoothInstrumentationTests
      bit RunBluetoothRoboTests (Could not find module, but the same situation
          before applying this patch)


Change-Id: I46a14c675eabd7cebd82562954380a9a769e80b5

parent d7eaae0f

core/tasks/module-info.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@ $(MODULE_INFO_JSON):
		'"installed": [$(foreach w,$(sort $(ALL_MODULES.$(m).INSTALLED)),"$(w)", )], ' \
		'"compatibility_suites": [$(foreach w,$(sort $(ALL_MODULES.$(m).COMPATIBILITY_SUITES)),"$(w)", )], ' \
		'"auto_test_config": [$(ALL_MODULES.$(m).auto_test_config)], ' \
		'"module_name": ["$(ALL_MODULES.$(m).MODULE_NAME)"], ' \
		'"module_name": "$(ALL_MODULES.$(m).MODULE_NAME)", ' \
		'"test_config": [$(if $(ALL_MODULES.$(m).TEST_CONFIG),"$(ALL_MODULES.$(m).TEST_CONFIG)")], ' \
		'},\n' \
		) \| sed -e 's/, \]/]/g' -e 's/, \}/ }/g' -e '$$s/,$$//' >> $@