diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-09-10 19:33:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-10 19:33:24 +0000 |
| commit | 6d2ec76a17e70041149006e06644afa77a947a25 (patch) | |
| tree | 1e0869f654e0880da5a81f1d28104b0f562f8793 | |
| parent | 2db599b0bdf17442d810b027f1dc4c0ee55b924a (diff) | |
| parent | ece4144fe1eed5853d3644d9afd5e49309090ea2 (diff) | |
| download | idea-6d2ec76a17e70041149006e06644afa77a947a25.tar.gz | |
Merge "Fix command line GUI test script on the Mac"
| -rw-r--r-- | build.xml | 3 | ||||
| -rw-r--r-- | build/scripts/gui_tests.gant | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/build.xml b/build.xml index 5a9fc1939f51..e651cf0e21a2 100644 --- a/build.xml +++ b/build.xml @@ -56,6 +56,9 @@ </target> <target name="guiTests" depends="init"> + <delete> + <fileset dir="${project.home}/build" includes="TEST-com.android.tools.idea.tests.gui.*"/> + </delete> <call_gant script="${project.home}/build/scripts/gui_tests.gant"/> </target> diff --git a/build/scripts/gui_tests.gant b/build/scripts/gui_tests.gant index a1713874cf76..00061c77ad2f 100644 --- a/build/scripts/gui_tests.gant +++ b/build/scripts/gui_tests.gant @@ -78,13 +78,11 @@ target('default' : "Run all UI tests") { //setProperty("testcases", ["com.android.tools.idea.tests.gui.layout.LayoutPreviewTest","com.android.tools.idea.tests.gui.layout.LayoutEditorTest"]) setProperty("testcases", ["com.android.tools.idea.tests.gui.GuiTestSuite"]) -def isMac = System.getProperty("os.name").toLowerCase().startsWith("mac") def args = [ "-Xmx2048m", "-XX:MaxPermSize=1024m", "-XX:ReservedCodeCacheSize=96m", "-XX:+UseCodeCacheFlushing" ] -if (isMac) args << "-d32"; setProperty("jvm_args", args) |