Fix meta.yml in test problems and jobs, reduce aplusb time limit

diff --git a/t/problems/aminusb/meta.yml b/t/problems/aminusb/meta.yml
index 1291dc90e0139299bfbe6f989e7e56aae1871977..69bcc749558a2cef53bc0a6f86ac65a11c8a3277 100644 (file)
--- a/t/problems/aminusb/meta.yml
+++ b/t/problems/aminusb/meta.yml
@@ -12,6 +12,3 @@ files:
   ver:
     format: CPP
     name: ver.cpp
-  prog:
-    format: CPP
-    name: prog.cpp

diff --git a/t/problems/aminusb/tests/ac/meta.yml b/t/problems/aminusb/tests/ac/meta.yml
index 6b2bc2f341eabdcd920e0b6c776188833bfb6120..faec3819bc72833337cb7ee2b25753be15662bc2 100644 (file)
--- a/t/problems/aminusb/tests/ac/meta.yml
+++ b/t/problems/aminusb/tests/ac/meta.yml
@@ -19,3 +19,7 @@ expected_results:
 - id: 5
   result: 0
   result_text: 20
+files:
+  prog:
+    format: CPP
+    name: prog.cpp

diff --git a/t/problems/aminusb/tests/wa/meta.yml b/t/problems/aminusb/tests/wa/meta.yml
index 285d9e1dff9bea8e04ef89e1c840f8291fbbd6f1..87d6d0e969694597bc61911693aa147067a04e8b 100644 (file)
--- a/t/problems/aminusb/tests/wa/meta.yml
+++ b/t/problems/aminusb/tests/wa/meta.yml
@@ -19,3 +19,7 @@ expected_results:
 - id: 5
   result: 1
   result_text: Wrong answer
+files:
+  prog:
+    format: CPP
+    name: prog.cpp

diff --git a/t/problems/aplusb/meta.yml b/t/problems/aplusb/meta.yml
index 6e20d6f17f47e308387ff803ecbf14677f0a639e..1979a448d40f5eb94e462b684c079691cad44b0c 100644 (file)
--- a/t/problems/aplusb/meta.yml
+++ b/t/problems/aplusb/meta.yml
@@ -4,14 +4,10 @@ generator: File
 judge: Points
 runner: File
 testcnt: 6
-timeout: 1
+timeout: 0.2
 mlimit: 20971520
 olimit: 100
 description: The simple A+B problem
-files:
-  prog:
-    format: CPP
-    name: prog.cpp
 tests:
 - 20
 - 20

diff --git a/t/problems/aplusb/tests/40/meta.yml b/t/problems/aplusb/tests/40/meta.yml
index 80a67ba2827b09e00721846f806cbf489034989c..80180bd1ab70f60b9e659700507091f0cba2be9c 100644 (file)
--- a/t/problems/aplusb/tests/40/meta.yml
+++ b/t/problems/aplusb/tests/40/meta.yml
@@ -22,4 +22,7 @@ expected_results:
 - id: 6
   result: 0
   result_text: 10
-
+files:
+  prog:
+    format: CPP
+    name: prog.cpp

diff --git a/t/problems/aplusb/tests/ac/meta.yml b/t/problems/aplusb/tests/ac/meta.yml
index f01b97f40cc6760fee7c888312ee865f129ce428..e5fa091d740a88c3d585fe3707cf1c46b548a5ee 100644 (file)
--- a/t/problems/aplusb/tests/ac/meta.yml
+++ b/t/problems/aplusb/tests/ac/meta.yml
@@ -22,3 +22,7 @@ expected_results:
 - id: 6
   result: 0
   result_text: 10
+files:
+  prog:
+    format: CPP
+    name: prog.cpp

diff --git a/t/problems/aplusb/tests/compile-error/meta.yml b/t/problems/aplusb/tests/compile-error/meta.yml
index a610d14f15b7e0584b6e3ed5dfff95c67a92330e..d994edb1563925edd4da58541be4f93ebed51128 100644 (file)
--- a/t/problems/aplusb/tests/compile-error/meta.yml
+++ b/t/problems/aplusb/tests/compile-error/meta.yml
@@ -2,4 +2,8 @@ test_name: Compile Error
 test_description: A program which does not compile
 problem: aplusb
 expected_result: -1
-expected_result_text: Compile error
\ No newline at end of file
+expected_result_text: Compile error
+files:
+  prog:
+    format: CPP
+    name: prog.cpp

diff --git a/t/problems/aplusb/tests/mle/meta.yml b/t/problems/aplusb/tests/mle/meta.yml
index b71c482f22154edd342fce2fd5e64f7affe3fd48..3228dd4ab7b085a9b35cd36c358a6d11ab758047 100644 (file)
--- a/t/problems/aplusb/tests/mle/meta.yml
+++ b/t/problems/aplusb/tests/mle/meta.yml
@@ -22,3 +22,7 @@ expected_results:
 - id: 6
   result: 5
   result_text: Crash (SIGKILL)
+files:
+  prog:
+    format: CPP
+    name: prog.cpp

diff --git a/t/problems/aplusb/tests/nzx/meta.yml b/t/problems/aplusb/tests/nzx/meta.yml
index 97dfc8df274e4a67a2d2bc578a987d2e1dc3648e..1d5241bec2763f0c121bd68fc080cb7749e250f0 100644 (file)
--- a/t/problems/aplusb/tests/nzx/meta.yml
+++ b/t/problems/aplusb/tests/nzx/meta.yml
@@ -22,3 +22,7 @@ expected_results:
 - id: 6
   result: 2
   result_text: 'Non-zero exit status: 42'
+files:
+  prog:
+    format: CPP
+    name: prog.cpp

diff --git a/t/problems/aplusb/tests/ole/meta.yml b/t/problems/aplusb/tests/ole/meta.yml
index f5248e075674037c9fee4e7059eafffabc1a888e..15f8430cbaf6593bc9e5b8e18d35107999809ed5 100644 (file)
--- a/t/problems/aplusb/tests/ole/meta.yml
+++ b/t/problems/aplusb/tests/ole/meta.yml
@@ -22,3 +22,7 @@ expected_results:
 - id: 6
   result: 4
   result_text: Output Limit Exceeded
+files:
+  prog:
+    format: CPP
+    name: prog.cpp

diff --git a/t/problems/aplusb/tests/tle/meta.yml b/t/problems/aplusb/tests/tle/meta.yml
index 976ac470edea5bed2d9fa8232d34cbb6f8c2fcc3..0abafd3d3851bb50b830137bd23f7eace1edf8fe 100644 (file)
--- a/t/problems/aplusb/tests/tle/meta.yml
+++ b/t/problems/aplusb/tests/tle/meta.yml
@@ -22,3 +22,7 @@ expected_results:
 - id: 6
   result: 3
   result_text: Time Limit Exceeded
+files:
+  prog:
+    format: CPP
+    name: prog.cpp

diff --git a/t/problems/double/meta.yml b/t/problems/double/meta.yml
index 21ffc4b4dec9aa05d8ba9ce7a637c50fee96d15a..8d4cede700cf0c1555451a061552f845271c5b2f 100644 (file)
--- a/t/problems/double/meta.yml
+++ b/t/problems/double/meta.yml
@@ -8,7 +8,3 @@ timeout: 1
 mlimit: 20971520
 olimit: 100
 description: The A * 2 problem
-files:
-  prog:
-    format: CPP
-    name: prog.cpp

diff --git a/t/problems/double/tests/wa/meta.yml b/t/problems/double/tests/wa/meta.yml
index 00f38dec03590ad0b355af8dc8d9d65131589e48..286a6117f3831b0e9c4c21600cc880dc92a55703 100644 (file)
--- a/t/problems/double/tests/wa/meta.yml
+++ b/t/problems/double/tests/wa/meta.yml
@@ -16,3 +16,7 @@ expected_results:
 - id: 4
   result: 1
   result_text: Wrong answer
+files:
+  prog:
+    format: CPP
+    name: prog.cpp

diff --git a/t/problems/increment/meta.yml b/t/problems/increment/meta.yml
index 3ca70dd7e50788ff6afa551d260372535808b068..dc011590d54a076a8ccf2138a8dfe54bb5306430 100644 (file)
--- a/t/problems/increment/meta.yml
+++ b/t/problems/increment/meta.yml
@@ -11,6 +11,3 @@ files:
   int:
     format: CPP
     name: int.cpp
-  prog:
-    format: CPP
-    name: prog.cpp

diff --git a/t/problems/increment/tests/ac/meta.yml b/t/problems/increment/tests/ac/meta.yml
index 9576c5c65e17c17e4b2382fc1eee741ccd23f590..37dd268261428a230f602a2edcfb9d74db60a130 100644 (file)
--- a/t/problems/increment/tests/ac/meta.yml
+++ b/t/problems/increment/tests/ac/meta.yml
@@ -19,3 +19,7 @@ expected_results:
 - id: 5
   result: 0
   result_text: 20
+files:
+  prog:
+    format: CPP
+    name: prog.cpp

diff --git a/t/problems/square/meta.yml b/t/problems/square/meta.yml
index 99ee8506a2cd92846b8320b668f2063d483357ca..660f161f105516a0c0fa960485c5e01cc82443d5 100644 (file)
--- a/t/problems/square/meta.yml
+++ b/t/problems/square/meta.yml
@@ -15,6 +15,3 @@ files:
   gen:
     format: CPP
     name: gen.cpp
-  prog:
-    format: CPP
-    name: prog.cpp

diff --git a/t/problems/square/tests/ac/meta.yml b/t/problems/square/tests/ac/meta.yml
index 93fd38f2cb9b0149ab9e267d566ac13675ad0260..04437d6eda1ac6d9259537912405d0139bd7c93d 100644 (file)
--- a/t/problems/square/tests/ac/meta.yml
+++ b/t/problems/square/tests/ac/meta.yml
@@ -34,3 +34,7 @@ expected_results:
 - id: 10
   result: 0
   result_text: 10
+files:
+  prog:
+    format: CPP
+    name: prog.cpp