From e9fcef97c71d01e92658af522b5ecb99a751b540 Mon Sep 17 00:00:00 2001
From: J08nY
Date: Wed, 3 Jan 2018 22:25:02 +0100
Subject: Fix YAML export and standalone build.

---
 build-standalone.xml                                       | 6 ++++--
 src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java | 2 +-
 src/cz/crcs/ectester/standalone/test/KeyAgreementTest.java | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/build-standalone.xml b/build-standalone.xml
index a4bb434..dcfb1f3 100644
--- a/build-standalone.xml
+++ b/build-standalone.xml
@@ -93,8 +93,10 @@
 
     <target name="-post-compile" depends="libs-try"/>
     <target name="-post-clean">
-        <exec dir="src/cz/crcs/ectester/standalone/libs/jni" failonerror="true" executable="make clean"
-              osfamily="unix"/>
+        <exec dir="src/cz/crcs/ectester/standalone/libs/jni" failonerror="true" executable="make"
+              osfamily="unix">
+            <arg value="clean"/>
+        </exec>
     </target>
 
     <target name="headers" depends="compile">
diff --git a/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java b/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java
index 955a144..e9c293f 100644
--- a/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java
+++ b/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java
@@ -33,7 +33,7 @@ public abstract class BaseYAMLTestWriter implements TestWriter {
         testSuite.put("desc", suite.getDescription());
 
         testRun.put("suite", testSuite);
-        testRun.put("run", tests);
+        testRun.put("tests", tests);
     }
 
     abstract protected Map<String, Object> testableObject(Testable t);
diff --git a/src/cz/crcs/ectester/standalone/test/KeyAgreementTest.java b/src/cz/crcs/ectester/standalone/test/KeyAgreementTest.java
index 16a2080..5f697c4 100644
--- a/src/cz/crcs/ectester/standalone/test/KeyAgreementTest.java
+++ b/src/cz/crcs/ectester/standalone/test/KeyAgreementTest.java
@@ -20,9 +20,9 @@ public class KeyAgreementTest extends SimpleTest<KeyAgreementTestable> {
             @Override
             public Result apply(KeyAgreementTestable ka) {
                 if (Arrays.equals(ka.getSecret(), expectedSecret)) {
-                    return new Result(Result.Value.SUCCESS);
+                    return new Result(Result.Value.SUCCESS, "The KeyAgreement result matched the expected derived secret.");
                 } else {
-                    return new Result(Result.Value.FAILURE);
+                    return new Result(Result.Value.FAILURE, "The KeyAgreement result did not match the expected derived secret.");
                 }
             }
         });
-- 
cgit v1.2.3-70-g09d2