OSDN Git Service

Audio VTS: remove expectation of policy configuration unicity
authorKevin Rocard <krocard@google.com>
Fri, 8 Sep 2017 22:12:14 +0000 (22:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 8 Sep 2017 22:12:14 +0000 (22:12 +0000)
am: 76efe01bbd

Change-Id: I23948718eaed0a687cc7dbd6b4940fc8514fbe1b

audio/2.0/vts/functional/ValidateAudioConfiguration.cpp

index 5fc1b3d..ee49023 100644 (file)
@@ -24,13 +24,9 @@ TEST(CheckConfig, audioPolicyConfigurationValidation) {
     const char* possibleConfigLocations[] = {"/odm/etc", "/vendor/etc", "/system/etc"};
     const char* configSchemaPath = "/data/local/tmp/audio_policy_configuration.xsd";
 
-    bool found = false;
     for (std::string folder : possibleConfigLocations) {
         const auto configPath = folder + '/' + configName;
         if (access(configPath.c_str(), R_OK) == 0) {
-            ASSERT_FALSE(found) << "Multiple " << configName << " found in "
-                                << ::testing::PrintToString(possibleConfigLocations);
-            found = true;
             ASSERT_VALID_XML(configPath.c_str(), configSchemaPath);
         }
     }