From d79dccc0627ecf240f5c2f7f913f66da70bb5be1 Mon Sep 17 00:00:00 2001 From: J08nY Date: Sun, 18 Aug 2024 20:51:31 +0200 Subject: Fix txt not choosing the correct output type in standalone. --- nix/test_all.py | 2 +- .../main/java/cz/crcs/ectester/standalone/output/FileTestWriter.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nix/test_all.py b/nix/test_all.py index 4def600..68e5257 100644 --- a/nix/test_all.py +++ b/nix/test_all.py @@ -74,7 +74,7 @@ def test_library(library, test_suite, version): opts.extend(globals()[f"{test_suite.replace('-', '_')}_options"](library)) command = ["./result/bin/ECTesterStandalone", "test", f"-oyml:results/yml/{library}_{test_suite}_{version}.yml", - f"-otxt:results/txt/{library}_{test_suite}_{version}.txt", + f"-otext:results/txt/{library}_{test_suite}_{version}.txt", f"-oxml:results/xml/{library}_{test_suite}_{version}.xml", "-q", *opts, test_suite, library] try: diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/output/FileTestWriter.java b/standalone/src/main/java/cz/crcs/ectester/standalone/output/FileTestWriter.java index a7dd017..1376dfb 100644 --- a/standalone/src/main/java/cz/crcs/ectester/standalone/output/FileTestWriter.java +++ b/standalone/src/main/java/cz/crcs/ectester/standalone/output/FileTestWriter.java @@ -13,7 +13,7 @@ import java.util.regex.Pattern; */ public class FileTestWriter extends BaseFileTestWriter { - private static final Pattern PREFIX = Pattern.compile("(text|xml|yaml|yml):.+"); + private static final Pattern PREFIX = Pattern.compile("(text|txt|xml|yaml|yml):.+"); public FileTestWriter(String defaultFormat, boolean systemOut, String[] files) throws ParserConfigurationException, FileNotFoundException { super(defaultFormat, systemOut, files); @@ -37,6 +37,7 @@ public class FileTestWriter extends BaseFileTestWriter { } switch (format) { case "text": + case "txt": return new TextTestWriter(out); case "xml": return new XMLTestWriter(out); -- cgit v1.2.3-70-g09d2