Fix bad redirection into test toolchain

Change-Id: Ibb281abf5d0c8c348094a923b708de8f7fe32267

3 files changed, 16 insertions, 16 deletions

diff --git a/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java
index 0aab2630..b8d565b1 100644
--- a/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java
+++ b/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java
@@ -89,8 +89,8 @@ public class JackCliToolchain extends JackBasedToolchain {
     AbstractTestTools.addFile(args, /* mustExist = */ false, sources);
 
     ExecuteFile exec = new ExecuteFile(args.toArray(new String[args.size()]));
-    exec.setErr(outRedirectStream);
-    exec.setOut(errRedirectStream);
+    exec.setErr(errRedirectStream);
+    exec.setOut(outRedirectStream);
     exec.setVerbose(isVerbose);
 
     try {
@@ -120,8 +120,8 @@ public class JackCliToolchain extends JackBasedToolchain {
     AbstractTestTools.addFile(args, /* mustExist = */ false, sources);
 
     ExecuteFile exec = new ExecuteFile(args.toArray(new String[args.size()]));
-    exec.setErr(outRedirectStream);
-    exec.setOut(errRedirectStream);
+    exec.setErr(errRedirectStream);
+    exec.setOut(outRedirectStream);
     exec.setVerbose(isVerbose);
 
     try {
@@ -202,8 +202,8 @@ public class JackCliToolchain extends JackBasedToolchain {
     args.add(out.getAbsolutePath());
 
     ExecuteFile exec = new ExecuteFile(args.toArray(new String[args.size()]));
-    exec.setErr(outRedirectStream);
-    exec.setOut(errRedirectStream);
+    exec.setErr(errRedirectStream);
+    exec.setOut(outRedirectStream);
     exec.setVerbose(isVerbose);
 
     try {
@@ -229,8 +229,8 @@ public class JackCliToolchain extends JackBasedToolchain {
     args.add(out.getAbsolutePath());
 
     ExecuteFile exec = new ExecuteFile(args.toArray(new String[args.size()]));
-    exec.setErr(outRedirectStream);
-    exec.setOut(errRedirectStream);
+    exec.setErr(errRedirectStream);
+    exec.setOut(outRedirectStream);
     exec.setVerbose(isVerbose);
 
     try {
diff --git a/jack-tests/src/com/android/jack/test/toolchain/LegacyJillToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/LegacyJillToolchain.java
index be9667b4..6684769b 100644
--- a/jack-tests/src/com/android/jack/test/toolchain/LegacyJillToolchain.java
+++ b/jack-tests/src/com/android/jack/test/toolchain/LegacyJillToolchain.java
@@ -166,8 +166,8 @@ public class LegacyJillToolchain extends JillBasedToolchain {
     args.add(out.getAbsolutePath());
 
     ExecuteFile exec = new ExecuteFile(args.toArray(new String[args.size()]));
-    exec.setErr(outRedirectStream);
-    exec.setOut(errRedirectStream);
+    exec.setErr(errRedirectStream);
+    exec.setOut(outRedirectStream);
     exec.setVerbose(isVerbose);
 
     if (exec.run() != 0) {
@@ -255,8 +255,8 @@ public class LegacyJillToolchain extends JillBasedToolchain {
     args.add(out.getAbsolutePath());
 
     ExecuteFile exec = new ExecuteFile(args.toArray(new String[args.size()]));
-    exec.setErr(outRedirectStream);
-    exec.setOut(errRedirectStream);
+    exec.setErr(errRedirectStream);
+    exec.setOut(outRedirectStream);
     exec.setVerbose(isVerbose);
 
     if (exec.run() != 0) {
@@ -330,8 +330,8 @@ public class LegacyJillToolchain extends JillBasedToolchain {
     arguments.add(out.getAbsolutePath());
 
     ExecuteFile execFile = new ExecuteFile(arguments.toArray(new String[arguments.size()]));
-    execFile.setErr(outRedirectStream);
-    execFile.setOut(errRedirectStream);
+    execFile.setErr(errRedirectStream);
+    execFile.setOut(outRedirectStream);
     execFile.setVerbose(isVerbose);
     try {
       if (execFile.run() != 0) {
diff --git a/jack-tests/src/com/android/jack/test/toolchain/LegacyToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/LegacyToolchain.java
index 2cc05380..512dae6d 100644
--- a/jack-tests/src/com/android/jack/test/toolchain/LegacyToolchain.java
+++ b/jack-tests/src/com/android/jack/test/toolchain/LegacyToolchain.java
@@ -309,8 +309,8 @@ public class LegacyToolchain extends AndroidToolchain {
     arguments.add(out.getAbsolutePath());
 
     ExecuteFile execFile = new ExecuteFile(arguments.toArray(new String[arguments.size()]));
-    execFile.setErr(outRedirectStream);
-    execFile.setOut(errRedirectStream);
+    execFile.setErr(errRedirectStream);
+    execFile.setOut(outRedirectStream);
     execFile.setVerbose(isVerbose);
     try {
       if (execFile.run() != 0) {