Merge branch 'release/v0.10.0'

.gitignore

@@ -3,3 +3,4 @@
 go.sum
 .tmp
 dist
+titania-out

CHANGELOG.md

@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.10.0] - 2022-06-26
+
+### Added
+
+- Option `--no-json`: do not print output json.
+
+### Change
+
+- Perf: Now titania.go doesn't hold input/output/code/... data.
+- Hence, intermediate files should be always created now, and the default directory is `./titania-out`.
+
 ## [0.9.3] - 2021-06-24
 
 ### Added

README.md

@@ -62,7 +62,11 @@ The directories should contain `titania.json`, like below.
     { "pattern": "./source_code/main.*" },
     {
       "pattern": "./source_code/wrong_answer.rb",
-      "expect": { "default": "FAIL", "test_case/01": "PASS", "test_case/03": "EXECUTION TIMEOUT" }
+      "expect": {
+        "default": "FAIL",
+        "test_case/01": "PASS",
+        "test_case/03": "EXECUTION TIMEOUT"
+      }
     },
     { "pattern": "./source_code/time_out.rb" },
     { "pattern": "./source_code/build_error.c", "expect": "BUILD FAILURE" }
@@ -235,15 +239,19 @@ You can narrow down tests by languages.
 
 #### `--quiet`
 
-Suppres runtime information output.
+Suppress runtime information output.
+
+#### `--no-json`
+
+Do not print final output json.
 
 #### `--pretty`
 
 Pretty printing the output json.
 
 #### `--tmpdir=DIRNAME`
 
-You can set where to put the intermediate files when executing tests. If not specified, intermediate files will not be created.
+You can set where to put the intermediate files when executing tests. Default is `./titania-out`.
 
 #### `--maxjob=N`
 
@@ -299,4 +307,6 @@ Or, if you just want to know runtime information, below is the way you go (Like
 
 ```bash
 $ titania.go [directories] > /dev/null
+# or
+$ titania.go --no-json [directories]
 ```

cmd/titania.go/main.go

@@ -4,7 +4,7 @@ import (
 	"os"
 )
 
-const VERSION string = "v0.9.3"
+const VERSION string = "v0.10.0"
 
 func main() {
 	directories := optparse()
@@ -18,5 +18,7 @@ func main() {
 	}
 
 	final(uresults)
-	printjson(uresults)
+	if !nojson {
+		printjson(uresults)
+	}
 }

cmd/titania.go/option.go

@@ -13,6 +13,7 @@ import (
 
 var (
 	prettyprint = false
+	nojson      = false
 )
 
 func version() {
@@ -29,10 +30,11 @@ directories:
 options:
   -h, --help                   show this help message
   -v, --version                show version
+      --no-json                do not print json
       --pretty                 pretty print output json
       --quiet                  quiet log
       --lang=lang1[,lang2,...] language[s] to test
-      --tmpdir=DIRNAME         set a directory where temporary files are put
+      --tmpdir=DIRNAME         set a directory where temporary files are put (default: ./titania-out)
       --maxjob=N               set a maximum number of jobs to run concurrently (N > 0)
 `)
 }
@@ -95,6 +97,8 @@ func optparse() []string {
 			tester.SetQuiet(true)
 		case "--pretty":
 			prettyprint = true
+		case "--no-json":
+			nojson = true
 		case "--lang":
 			if len(os.Args) < i+3 {
 				usage()

cmd/titania.go/wrapup.go

@@ -79,8 +79,19 @@ func buildjson(w io.Writer, uresults []*tester.TestUnitResult) {
 									obj.SetString("time", cresult.Time)
 									obj.SetString("expect", cresult.Expect)
 									obj.SetString("result", cresult.Result)
-									obj.SetStringFromReader("output", cresult.Output)
-									obj.SetStringFromReader("others", cresult.Others)
+									// write output from file
+									if fp, err := os.Open(cresult.Output); err == nil {
+										obj.SetStringFromReader("output", bufio.NewReader(fp))
+									}
+									// write other info from files
+									buf := bytes.NewBuffer([]byte{})
+									for _, file := range cresult.Others {
+										if fp, err := os.Open(file); err == nil {
+											bufio.NewReader(fp).WriteTo(buf)
+										}
+									}
+									obj.SetStringFromReader("others", buf)
+									// errors (in this application)
 									obj.SetString("errors", cresult.Errors)
 								})
 							}

pkg/file/file.go

@@ -0,0 +1,35 @@
+package file
+
+import (
+	"bufio"
+	"bytes"
+	"io"
+	"os"
+)
+
+// compare two files' contents
+func Equal(a, b string) (bool, error) {
+	fpA, err := os.Open(a)
+	if err != nil {
+		return false, err
+	}
+	defer fpA.Close()
+
+	fpB, err := os.Open(b)
+	if err != nil {
+		return false, err
+	}
+	defer fpB.Close()
+
+	bytesA, err := io.ReadAll(bufio.NewReader(fpA))
+	if err != nil {
+		return false, nil
+	}
+
+	bytesB, err := io.ReadAll(bufio.NewReader(fpB))
+	if err != nil {
+		return false, nil
+	}
+
+	return bytes.Equal(bytesA, bytesB), nil
+}