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

Commit 4f3b8527 authored by Deepanshu Gupta's avatar Deepanshu Gupta
Browse files

Update JRE for runConfigurations. 

The intensive bridge tests use some libraries that are compiled with
1.7. All other tests are capable of running on JRE 1.6. Thus, change the
run configurations appropriately.

Change-Id: Iaea0fef2e58877578b36ac2ffe0b20b3a55f572c
parent 6092c044

tools/layoutlib/.idea/runConfigurations/All_in_bridge.xml

+4 −10
Original line number Original line Diff line number Diff line 
<component name="ProjectRunConfigurationManager">

<component name="ProjectRunConfigurationManager">

  <configuration default="false" name="All in bridge" type="JUnit" factoryName="JUnit" singleton="true" nameIsGenerated="true">

  <configuration default="false" name="All in bridge" type="JUnit" factoryName="JUnit" singleton="true">

    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />

    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />

    <module name="bridge" />

    <module name="bridge" />

    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />

    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />

    <option name="ALTERNATIVE_JRE_PATH" value="" />

    <option name="ALTERNATIVE_JRE_PATH" value="1.7" />

    <option name="PACKAGE_NAME" value="" />

    <option name="PACKAGE_NAME" value="" />

    <option name="MAIN_CLASS_NAME" value="" />

    <option name="MAIN_CLASS_NAME" value="" />

    <option name="METHOD_NAME" value="" />

    <option name="METHOD_NAME" value="" />

    <option name="TEST_OBJECT" value="package" />

    <option name="TEST_OBJECT" value="package" />

    <option name="VM_PARAMETERS" value="-ea -Dtest_res.dir=&quot;$PROJECT_DIR$/bridge/tests/res&quot;" />

    <option name="VM_PARAMETERS" value="-ea" />

    <option name="PARAMETERS" value="" />

    <option name="PARAMETERS" value="" />

    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />

    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />

    <option name="ENV_VARIABLES" />

    <option name="ENV_VARIABLES" />
@@ -18,13 +18,7 @@ 
    </option>

    </option>

    <envs />

    <envs />

    <patterns />

    <patterns />

    <RunnerSettings RunnerId="Debug">

      <option name="DEBUG_PORT" value="" />

      <option name="TRANSPORT" value="0" />

      <option name="LOCAL" value="true" />

    </RunnerSettings>

    <RunnerSettings RunnerId="Run" />

    <RunnerSettings RunnerId="Run" />

    <ConfigurationWrapper RunnerId="Debug" />

    <ConfigurationWrapper RunnerId="Run" />

    <ConfigurationWrapper RunnerId="Run" />

    <method />

    <method />

  </configuration>

  </configuration>

tools/layoutlib/.idea/runConfigurations/Bridge_quick.xml

0 → 100644
+29 −0
Original line number Original line Diff line number Diff line 
<component name="ProjectRunConfigurationManager">

  <configuration default="false" name="Bridge quick" type="JUnit" factoryName="JUnit">

    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />

    <module name="bridge" />

    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />

    <option name="ALTERNATIVE_JRE_PATH" value="" />

    <option name="PACKAGE_NAME" />

    <option name="MAIN_CLASS_NAME" value="" />

    <option name="METHOD_NAME" value="" />

    <option name="TEST_OBJECT" value="pattern" />

    <option name="VM_PARAMETERS" value="-ea" />

    <option name="PARAMETERS" value="" />

    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />

    <option name="ENV_VARIABLES" />

    <option name="PASS_PARENT_ENVS" value="true" />

    <option name="TEST_SEARCH_SCOPE">

      <value defaultName="singleModule" />

    </option>

    <envs />

    <patterns>

      <pattern testClass="com.android.layoutlib.bridge.TestDelegates" />

      <pattern testClass="android.graphics.Matrix_DelegateTest" />

      <pattern testClass="com.android.layoutlib.bridge.android.BridgeXmlBlockParserTest" />

    </patterns>

    <RunnerSettings RunnerId="Run" />

    <ConfigurationWrapper RunnerId="Run" />

    <method />

  </configuration>

</component>
 
 No newline at end of file

tools/layoutlib/.idea/runConfigurations/Create.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -5,8 +5,8 @@ 
    <option name="VM_PARAMETERS" value="" />

    <option name="VM_PARAMETERS" value="" />

    <option name="PROGRAM_PARAMETERS" value="out/host/common/obj/JAVA_LIBRARIES/temp_layoutlib_intermediates/javalib.jar out/target/common/obj/JAVA_LIBRARIES/core-libart_intermediates/classes.jar out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes.jar out/target/common/obj/JAVA_LIBRARIES/ext_intermediates/classes.jar out/target/common/obj/JAVA_LIBRARIES/ext_intermediates/javalib.jar" />

    <option name="PROGRAM_PARAMETERS" value="out/host/common/obj/JAVA_LIBRARIES/temp_layoutlib_intermediates/javalib.jar out/target/common/obj/JAVA_LIBRARIES/core-libart_intermediates/classes.jar out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes.jar out/target/common/obj/JAVA_LIBRARIES/ext_intermediates/classes.jar out/target/common/obj/JAVA_LIBRARIES/ext_intermediates/javalib.jar" />

    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../../../../" />

    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../../../../" />

    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />

    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />

    <option name="ALTERNATIVE_JRE_PATH" value="1.6" />

    <option name="ALTERNATIVE_JRE_PATH" value="" />

    <option name="ENABLE_SWING_INSPECTOR" value="false" />

    <option name="ENABLE_SWING_INSPECTOR" value="false" />

    <option name="ENV_VARIABLES" />

    <option name="ENV_VARIABLES" />

    <option name="PASS_PARENT_ENVS" value="true" />

    <option name="PASS_PARENT_ENVS" value="true" />