Merge branch 'master' into scaleway

diff --git a/gruntmaster-compile b/gruntmaster-compile
index be5dab5c3bccd03a3076c4061ee41c0dc078b0f7..adf2149705ee174356ed7d1912d5c6fbac64acd9 100755 (executable)
--- a/gruntmaster-compile
+++ b/gruntmaster-compile
@@ -30,6 +30,7 @@ given ($format){
        exec 'go', qw/build -compiler gccgo/, $name, when 'GCCGO';
        exec 'ghc', qw/-DONLINE_JUDGE -Wall -O2 -o/, $basename, $name when 'HASKELL';
        exec 'rustc', qw/-O -o/, $basename, $name when 'RUST';
+       exec 'obc', qw/-x -o/, $basename, $name when 'OBERON';
        exec 'ocamlc', qw/-o/, $basename, $name when 'OCAML';
        exec 'dmd', qw/-version=ONLINE_JUDGE -O -release -inline -noboundscheck/, $name when 'D';
 
@@ -124,6 +125,10 @@ Compile commands for each format:
 
   ocamlc -o $output $input
 
+=item OBERON
+
+  obc -x -o $output $input
+
 =item RUST
 
   rustc -O -o $output $input

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index 59ee1650c8a05a8f939e301bdb361234ea590b64..b8c6b5c5c839052baf31bd6a50d42d5cf3298cac 100644 (file)
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -29,6 +29,7 @@ use constant FORMAT_EXTENSION => {
        JAVA => 'java',
        JULIA => 'jl',
        MONO => 'cs',
+       OBERON => 'm',
        OCAML => 'ml',
        PASCAL => 'pas',
        PERL => 'pl',

diff --git a/t/01-jobs.t b/t/01-jobs.t
index ee9cb27a6cdc25d9e662512d8be49755856f55f0..a7a1ffaa7e6014e160aef23b3c245032a9011a37 100644 (file)
--- a/t/01-jobs.t
+++ b/t/01-jobs.t
@@ -36,6 +36,7 @@ use constant COMPILER => {
           PYTHON python2.7
           RUBY ruby
           RUST rustc
+          OBERON obc
           OCAML ocaml
           SBCL sbcl/};
 

diff --git a/t/problems/hello/tests/oberon/meta.yml b/t/problems/hello/tests/oberon/meta.yml
new file mode 100644 (file)
index 0000000..1c95834
--- /dev/null
+++ b/t/problems/hello/tests/oberon/meta.yml
@@ -0,0 +1,7 @@
+test_name: Oberon
+test_description: Hello world in Oberon
+problem: hello
+files:
+  prog:
+    format: OBERON
+    name: prog.m

diff --git a/t/problems/hello/tests/oberon/prog.m b/t/problems/hello/tests/oberon/prog.m
new file mode 100644 (file)
index 0000000..e67028f
--- /dev/null
+++ b/t/problems/hello/tests/oberon/prog.m
@@ -0,0 +1,8 @@
+MODULE prog;
+
+IMPORT Out;
+
+BEGIN
+  Out.String("Hello World!");
+  Out.Ln
+END prog.