add input+output support for runs

championswimmer · championswimmer · commit 82d6c8f25277 · 2017-11-15T00:15:57.000+05:30
Signed-off-by: Arnav Gupta &lt;arnav@codingblocks.com&gt;
diff --git a/containers/c/run.sh b/containers/c/run.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 chmod 777 exe
-./exe 1> run.stdout 2> run.stderr
+./exe < run.stdin 1> run.stdout 2> run.stderr
diff --git a/containers/cpp/run.sh b/containers/cpp/run.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 chmod 777 exe
-./exe 1> run.stdout 2> run.stderr
+./exe < run.stdin 1> run.stdout 2> run.stderr
diff --git a/containers/java8/Dockerfile b/containers/java8/Dockerfile
@@ -2,4 +2,9 @@ FROM alpine:3.6
 
 RUN apk add --no-cache openjdk8 bash
 ENV PATH="/usr/lib/jvm/java-1.8-openjdk/bin:${PATH}"
+
 COPY ./compile.sh /bin/compile.sh
+COPY ./run.sh /bin/run.sh
+
+RUN chmod 777 /bin/compile.sh; \
+    chmod 777 /bin/run.sh
diff --git a/containers/java8/run.sh b/containers/java8/run.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+java Main < run.stdin 1> run.stdout 2> run.stderr
diff --git a/tests/c/run.stdin b/tests/c/run.stdin
@@ -0,0 +1 @@
+World
diff --git a/tests/c/runbox/exe b/tests/c/runbox/exe
diff --git a/tests/c/runbox/run.stdin b/tests/c/runbox/run.stdin
@@ -0,0 +1 @@
+World
diff --git a/tests/c/runbox/source.c b/tests/c/runbox/source.c
@@ -1,6 +1,8 @@
 #include <stdio.h>
 
 int main () {
-    printf("Hello World");
+    char in[10];
+    scanf("%s", in);
+    printf("Hello %s", in);
     return 0;
 }
diff --git a/tests/c/source.c b/tests/c/source.c
@@ -1,6 +1,8 @@
 #include <stdio.h>
 
 int main () {
-    printf("Hello World");
+    char in[10];
+    scanf("%s", in);
+    printf("Hello %s", in);
     return 0;
 }
diff --git a/tests/c/test_worker.sh b/tests/c/test_worker.sh
@@ -9,6 +9,7 @@ mkdir -p $RUNBOX
 
 # Copy source to runbox
 cp $DIR/source.c $RUNBOX/source.c
+cp $DIR/run.stdin $RUNBOX/run.stdin
 
 # Test Compile
 docker run \
diff --git a/tests/cpp/run.stdin b/tests/cpp/run.stdin
@@ -0,0 +1 @@
+World
diff --git a/tests/cpp/runbox/compile.stderr b/tests/cpp/runbox/compile.stderr
@@ -1,4 +0,0 @@
-source.cpp: In function 'int main()':
-source.cpp:4:5: error: 'cout' was not declared in this scope
-     cout<<"Hello World!"
-     ^~~~
diff --git a/tests/cpp/runbox/exe b/tests/cpp/runbox/exe
diff --git a/tests/cpp/runbox/run.stderr b/tests/cpp/runbox/run.stderr
diff --git a/tests/cpp/runbox/run.stdin b/tests/cpp/runbox/run.stdin
@@ -0,0 +1 @@
+World
diff --git a/tests/cpp/runbox/run.stdout b/tests/cpp/runbox/run.stdout
@@ -0,0 +1 @@
+Hello World
diff --git a/tests/cpp/runbox/source.cpp b/tests/cpp/runbox/source.cpp
@@ -1,6 +1,8 @@
-#include <stdio.h>
+#include <iostream>
 using namespace std;
 int main () {
-    cout<<"Hello World!"
+    char in[10];
+    cin>>in;
+    cout<<"Hello "<<in;
     return 0;
 }
diff --git a/tests/cpp/source.cpp b/tests/cpp/source.cpp
@@ -1,6 +1,8 @@
-#include <stdio.h>
+#include <iostream>
 using namespace std;
 int main () {
-    cout<<"Hello World!"
+    char in[10];
+    cin>>in;
+    cout<<"Hello "<<in;
     return 0;
 }
diff --git a/tests/cpp/test_worker.sh b/tests/cpp/test_worker.sh
@@ -9,6 +9,7 @@ mkdir -p $RUNBOX
 
 # Copy source to runbox
 cp $DIR/source.cpp $RUNBOX/source.cpp
+cp $DIR/run.stdin $RUNBOX/run.stdin
 
 # Test Compile
 docker run \
diff --git a/tests/java8/Main.java b/tests/java8/Main.java
@@ -1,5 +1,9 @@
+import java.util.Scanner;
+
 public class Main {
     public static void main(String[] args) {
-        System.out.println("Hello");
+        Scanner in = new Scanner(System.in);
+        String input = in.next();
+        System.out.println("Hello " + input);
     }
 }
diff --git a/tests/java8/run.stdin b/tests/java8/run.stdin
@@ -0,0 +1 @@
+World
diff --git a/tests/java8/runbox/Main.class b/tests/java8/runbox/Main.class
diff --git a/tests/java8/runbox/Main.java b/tests/java8/runbox/Main.java
@@ -1,5 +1,9 @@
+import java.util.Scanner;
+
 public class Main {
     public static void main(String[] args) {
-        System.out.println("Hello");
+        Scanner in = new Scanner(System.in);
+        String input = in.next();
+        System.out.println("Hello " + input);
     }
 }
diff --git a/tests/java8/runbox/run.stderr b/tests/java8/runbox/run.stderr
diff --git a/tests/java8/runbox/run.stdin b/tests/java8/runbox/run.stdin
@@ -0,0 +1 @@
+World
diff --git a/tests/java8/runbox/run.stdout b/tests/java8/runbox/run.stdout
@@ -0,0 +1 @@
+Hello World
diff --git a/tests/java8/test_worker.sh b/tests/java8/test_worker.sh
@@ -9,6 +9,7 @@ mkdir -p $RUNBOX
 
 # Copy source to runbox
 cp $DIR/Main.java $RUNBOX/Main.java
+cp $DIR/run.stdin $RUNBOX/run.stdin
 
 # Test Compile
 docker run \
@@ -19,7 +20,7 @@ docker run \
     --read-only \
     -v "$RUNBOX":/usr/src/runbox \
     -w /usr/src/runbox codingblocks/judge-worker-java8 \
-    /bin/compile.sh
+    bash -c "/bin/compile.sh && /bin/run.sh"
 
 # Delete runbox
 #rm -rf $RUNBOX

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#!/usr/bin/env bash`
	`2`	`+`
	`3`	`+java Main < run.stdin 1> run.stdout 2> run.stderr`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`#include <stdio.h>`
`2`	`2`
`3`	`3`	`int main () {`
`4`		`- printf("Hello World");`
	`4`	`+ char in[10];`
	`5`	`+ scanf("%s", in);`
	`6`	`+ printf("Hello %s", in);`
`5`	`7`	`return 0;`
`6`	`8`	`}`