diff --git a/.vscode/launch.json b/.vscode/launch.json index 571851b5a..6d78cbcbf 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -67,7 +67,7 @@ "program": "${workspaceFolder}/cmd/trice", "env": {}, "args": ["log", - "-idlist", "${workspaceFolder}/test/til.json", + "-idlist", "${workspaceFolder}/_test/til.json", "-source", "RND", "-rndLimit", "10", "-rndMode", "ChaosMode", @@ -158,9 +158,9 @@ "-pf", "COBS", "-idlist", - "${workspaceFolder}/test/testdata/til.json", + "${workspaceFolder}/_test/testdata/til.json", "-li", - "${workspaceFolder}/test/testdata/li.json" + "${workspaceFolder}/_test/testdata/li.json" ] }, { @@ -202,9 +202,9 @@ "-d16", "-s", "-idlist", - "${workspaceFolder}/test/testdata/til.json", + "${workspaceFolder}/_test/testdata/til.json", "-li", - "${workspaceFolder}/test/testdata/li.json" + "${workspaceFolder}/_test/testdata/li.json" ] }, { @@ -236,9 +236,9 @@ "-args", "cb de 32 13 c0 0b 61 62 63 64 65 20 31 32 33 34 35 ad 00", "-idlist", - "${workspaceFolder}/test/testdata/til.json", + "${workspaceFolder}/_test/testdata/til.json", "-li", - "${workspaceFolder}/test/testdata/li.json" + "${workspaceFolder}/_test/testdata/li.json" ] }, { @@ -250,9 +250,9 @@ "env": {}, "args": ["log", "-idlist", - "${workspaceFolder}/test/testdata/til.json", + "${workspaceFolder}/_test/testdata/til.json", "-li", - "${workspaceFolder}/test/testdata/li.json", + "${workspaceFolder}/_test/testdata/li.json", "-port", "DUMP", "-args", @@ -291,9 +291,9 @@ "env": {}, "args": ["log", "-idlist", - "${workspaceFolder}/test/testdata/til.json", + "${workspaceFolder}/_test/testdata/til.json", "-li", - "${workspaceFolder}/test/testdata/li.json", + "${workspaceFolder}/_test/testdata/li.json", "-port", "COM6", "-baud", @@ -309,9 +309,9 @@ "env": {}, "args": ["log", "-idlist", - "${workspaceFolder}/test/testdata/til.json", + "${workspaceFolder}/_test/testdata/til.json", "-li", - "${workspaceFolder}/test/testdata/li.json", + "${workspaceFolder}/_test/testdata/li.json", "-port", "JLINK", "-args", @@ -412,9 +412,9 @@ "env": {}, "args": ["log", "-idlist", - "${workspaceFolder}/test/testdata/til.json", + "${workspaceFolder}/_test/testdata/til.json", "-locationInformation", - "${workspaceFolder}/test/testdata/li.json", + "${workspaceFolder}/_test/testdata/li.json", "-p", "com4", "-baud", diff --git a/README.md b/README.md index 995f620b6..0c5c27563 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ ![GitHub commits since latest release](https://img.shields.io/github/commits-since/rokath/trice/latest) [![Go Report Card](https://goreportcard.com/badge/github.com/rokath/trice)](https://goreportcard.com/report/github.com/rokath/trice) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) -[![test](https://github.com/shogo82148/actions-goveralls/workflows/test/badge.svg?branch=main)](https://coveralls.io/github/rokath/trice) +[![test](https://github.com/shogo82148/actions-goveralls/workflows/_test/badge.svg?branch=main)](https://coveralls.io/github/rokath/trice) [![Coverage Status](https://coveralls.io/repos/github/rokath/trice/badge.svg?branch=master)](https://coveralls.io/github/rokath/trice?branch=master) @@ -36,14 +36,14 @@ even inside **↯ interrupts** in less than 1 µs❗ ## Possible Use Cases -- Using *Trice* not only for **printf debugging** but also as **logging** technique is possible and gives the advantage to have very short messages (no strings) for transmission, but keep in mind that the file [til.json](./test/testdata/til.json) is the key to read all output if your devices in the field for 10 or more years. - - Optionally add [til.json](./test/testdata/til.json) as a (compressed) resource to your target image. One possibility is using [SRecord](http://srecord.sourceforge.net/download.html). Or simply provide a download link. +- Using *Trice* not only for **printf debugging** but also as **logging** technique is possible and gives the advantage to have very short messages (no strings) for transmission, but keep in mind that the file [til.json](./_test/testdata/til.json) is the key to read all output if your devices in the field for 10 or more years. + - Optionally add [til.json](./_test/testdata/til.json) as a (compressed) resource to your target image. One possibility is using [SRecord](http://srecord.sourceforge.net/download.html). Or simply provide a download link. - You can see *Trice* also as a kind of **data compression** what could be interesting for [IoT](https://en.wikipedia.org/wiki/Internet_of_things) things, especially [NB-IoT](https://en.wikipedia.org/wiki/Narrowband_IoT), where you have very low data rates. - Storing *Trice* messages in [FLASH memory](https://en.wikipedia.org/wiki/Flash_memory) for later log analysis saves memory because a typical `TRICE` occupies only 4 bytes independently of the format string length plus optional values. - Also, it is possible to **encrypt** the *Trice* transfer packets to get a reasonable protection for many cases. - - This way you can deliver firmware images with encrypted *Trice* output, only readable with the appropriate key and [til.json](./test/testdata/til.json). + - This way you can deliver firmware images with encrypted *Trice* output, only readable with the appropriate key and [til.json](./_test/testdata/til.json). - [XTEA](https://en.m.wikipedia.org/wiki/XTEA) is implemented as one option. -- You can even translate the [til.json](./test/testdata/til.json) file in **different languages**, so changing a language is just changing the [til.json](./test/testdata/til.json) file without touching the target binary. +- You can even translate the [til.json](./_test/testdata/til.json) file in **different languages**, so changing a language is just changing the [til.json](./_test/testdata/til.json) file without touching the target binary. - With *Trice* it is easy to do **timing analysis** on distributed embedded systems. Host and target timestamps are supported. ## How it approximately works (UART example) @@ -131,7 +131,7 @@ git clone https://github.com/rokath/trice.git - [Logging with symbols - The Embedonomicon](https://docs.rust-embedded.org/embedonomicon/logging.html) - [MCUViewer](https://github.com/klonyyy/MCUViewer) - [Memfault Compact Log Library](https://docs.memfault.com/docs/mcu/compact-logs/#host-decoding) -- [Metal Serial Library](https://github.com/metal-ci/test/tree/master/doc/metal.serial.md) +- [Metal Serial Library](https://github.com/metal-ci/_test/tree/master/doc/metal.serial.md) - [Minimal Structured Logging for Autonomous Vehikles](https://youtu.be/FyJI4Z6jD4w) (C++, closed source talk) - [NanoLog](https://github.com/PlatformLab/NanoLog) (Linux C++) - [Percepio Tracealyzer](https://percepio.com/tracealyzer/) (Visual Trace Diagnostics) diff --git a/_test/ReadMe.md b/_test/ReadMe.md index 116ec260a..5991a2768 100644 --- a/_test/ReadMe.md +++ b/_test/ReadMe.md @@ -45,13 +45,13 @@ The `testdata\cgoPackage.go` file contains a variable `testLines = n`, which lim ## Test Internals -The `./trice/test/testdata/*.c` and `./trice/src/*.c` are compiled together with the actual cgot package into one singe Trice test binary. Calling its TestFunction(s) causes the activation of the Trice statement(s) inside *triceCheck.c*. The ususally into an embedded device compiled Trice code generates a few bytes according to the configuration into a buffer. These bytes are transmitted in real life over a (serial) port or RTT. In the test this buffer is then read out by the Trice tool handler function according to the used CLI switches and processed to a log string using the *til.json* file. This string in then compared to the expected string for the activated line. +The `./trice/_test/testdata/*.c` and `./trice/src/*.c` are compiled together with the actual cgot package into one singe Trice test binary. Calling its TestFunction(s) causes the activation of the Trice statement(s) inside *triceCheck.c*. The ususally into an embedded device compiled Trice code generates a few bytes according to the configuration into a buffer. These bytes are transmitted in real life over a (serial) port or RTT. In the test this buffer is then read out by the Trice tool handler function according to the used CLI switches and processed to a log string using the *til.json* file. This string in then compared to the expected string for the activated line. Each `tf` is a **Go** package, which is not part of any **Go** application. They all named `cgot` and are only used independently for testing different configurations. The `tf/generated_cgoPackage.go` file is identical in all `tf`. Its master is `testdata/cgoPackage.go`. After editing the master, running the command `./updateTestData.sh` copies the master to all `tf` and renames it to `generated_cgoPackage.go`. The test specific target code configuration is inside `tf/trice.Config.h` and the appropriate Trice tool CLI switches are in `tf/cgo_test.go`. -When running `go test ./test/tf`, a Trice tool test executable is build, using the Trice tool packages and the `tf` package `cgot`, and the function `TestLogs` is executed. Its internal closure `triceLog` contains the Trice tool CLI switches and is passed to the `ccgot` package function `triceLogTest` together with the number of testLines and the trice mode (`directTransfer` or `deferrerdTransfer`). +When running `go test ./_test/tf`, a Trice tool test executable is build, using the Trice tool packages and the `tf` package `cgot`, and the function `TestLogs` is executed. Its internal closure `triceLog` contains the Trice tool CLI switches and is passed to the `ccgot` package function `triceLogTest` together with the number of testLines and the trice mode (`directTransfer` or `deferrerdTransfer`). During the test, the file `triceCheck.c` is scanned for lines like diff --git a/_test/_ERROR_dblB_di_cobs_rtt32__de_xtea_cobs_ua/cgo_test.go b/_test/_ERROR_dblB_di_cobs_rtt32__de_xtea_cobs_ua/cgo_test.go index 1a1f98381..2efcf8314 100644 --- a/_test/_ERROR_dblB_di_cobs_rtt32__de_xtea_cobs_ua/cgo_test.go +++ b/_test/_ERROR_dblB_di_cobs_rtt32__de_xtea_cobs_ua/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog0 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=COBS", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=COBS", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } @@ -25,7 +25,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog1 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pw=MySecret", "-pf=COBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pw=MySecret", "-pf=COBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/_ERROR_dblB_di_cobs_rtt32__de_xtea_cobs_ua/generated_cgoPackage.go b/_test/_ERROR_dblB_di_cobs_rtt32__de_xtea_cobs_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/_ERROR_dblB_di_cobs_rtt32__de_xtea_cobs_ua/generated_cgoPackage.go +++ b/_test/_ERROR_dblB_di_cobs_rtt32__de_xtea_cobs_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/_ERROR_ringB_di_cobs_rtt32__de_xtea_cobs_ua/cgo_test.go b/_test/_ERROR_ringB_di_cobs_rtt32__de_xtea_cobs_ua/cgo_test.go index 1a1f98381..2efcf8314 100644 --- a/_test/_ERROR_ringB_di_cobs_rtt32__de_xtea_cobs_ua/cgo_test.go +++ b/_test/_ERROR_ringB_di_cobs_rtt32__de_xtea_cobs_ua/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog0 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=COBS", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=COBS", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } @@ -25,7 +25,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog1 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pw=MySecret", "-pf=COBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pw=MySecret", "-pf=COBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/_ERROR_ringB_di_cobs_rtt32__de_xtea_cobs_ua/generated_cgoPackage.go b/_test/_ERROR_ringB_di_cobs_rtt32__de_xtea_cobs_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/_ERROR_ringB_di_cobs_rtt32__de_xtea_cobs_ua/generated_cgoPackage.go +++ b/_test/_ERROR_ringB_di_cobs_rtt32__de_xtea_cobs_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/_ERROR_ringB_di_xtea_cobs_rtt32__de_cobs_ua/cgo_test.go b/_test/_ERROR_ringB_di_xtea_cobs_rtt32__de_cobs_ua/cgo_test.go index d42c34796..1a208fd17 100644 --- a/_test/_ERROR_ringB_di_xtea_cobs_rtt32__de_cobs_ua/cgo_test.go +++ b/_test/_ERROR_ringB_di_xtea_cobs_rtt32__de_cobs_ua/cgo_test.go @@ -18,7 +18,7 @@ func TestLogs(t *testing.T) { triceLog0 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer // trice -p jlink -args "-Device STM32F030R8 -if SWD -Speed 4000 -RTTChannel 0" -showID "deb:%04x" -hs off -pw MySecret -pf COBS -d16=true - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pw=MySecret", "-pf=COBS", "-d16=true", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pw=MySecret", "-pf=COBS", "-d16=true", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } @@ -27,7 +27,7 @@ func TestLogs(t *testing.T) { triceLog1 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer // trice l -p com4 -d16=false - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=COBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=COBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/_ERROR_ringB_di_xtea_cobs_rtt32__de_cobs_ua/generated_cgoPackage.go b/_test/_ERROR_ringB_di_xtea_cobs_rtt32__de_cobs_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/_ERROR_ringB_di_xtea_cobs_rtt32__de_cobs_ua/generated_cgoPackage.go +++ b/_test/_ERROR_ringB_di_xtea_cobs_rtt32__de_cobs_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/_ERROR_ringB_di_xtea_cobs_rtt32__de_tcobs_ua/cgo_test.go b/_test/_ERROR_ringB_di_xtea_cobs_rtt32__de_tcobs_ua/cgo_test.go index eb5dfdb13..4b22b405a 100644 --- a/_test/_ERROR_ringB_di_xtea_cobs_rtt32__de_tcobs_ua/cgo_test.go +++ b/_test/_ERROR_ringB_di_xtea_cobs_rtt32__de_tcobs_ua/cgo_test.go @@ -18,7 +18,7 @@ func TestLogs(t *testing.T) { triceLog0 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer // trice -p jlink -args "-Device STM32F030R8 -if SWD -Speed 4000 -RTTChannel 0" -showID "deb:%04x" -hs off -pw MySecret -pf COBS -d16=true - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pw=MySecret", "-pf=COBS", "-d16=true", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pw=MySecret", "-pf=COBS", "-d16=true", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } @@ -27,7 +27,7 @@ func TestLogs(t *testing.T) { triceLog1 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer // trice l -p com4 -d16=false - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=TCOBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=TCOBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/_ERROR_ringB_di_xtea_cobs_rtt32__de_tcobs_ua/generated_cgoPackage.go b/_test/_ERROR_ringB_di_xtea_cobs_rtt32__de_tcobs_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/_ERROR_ringB_di_xtea_cobs_rtt32__de_tcobs_ua/generated_cgoPackage.go +++ b/_test/_ERROR_ringB_di_xtea_cobs_rtt32__de_tcobs_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/be_dblB_de_tcobs_ua/cgo_test.go b/_test/be_dblB_de_tcobs_ua/cgo_test.go index 96ae4e665..da7f8adbd 100644 --- a/_test/be_dblB_de_tcobs_ua/cgo_test.go +++ b/_test/be_dblB_de_tcobs_ua/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-triceEndianness=bigEndian", "-hs=off", "-prefix=off", "-li=off", "-color=off", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-triceEndianness=bigEndian", "-hs=off", "-prefix=off", "-li=off", "-color=off", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/be_dblB_de_tcobs_ua/generated_cgoPackage.go b/_test/be_dblB_de_tcobs_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/be_dblB_de_tcobs_ua/generated_cgoPackage.go +++ b/_test/be_dblB_de_tcobs_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/be_staticB_di_xtea_cobs_rtt32/cgo_test.go b/_test/be_staticB_di_xtea_cobs_rtt32/cgo_test.go index 2878a0237..2e8038ada 100644 --- a/_test/be_staticB_di_xtea_cobs_rtt32/cgo_test.go +++ b/_test/be_staticB_di_xtea_cobs_rtt32/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-triceEndianness=bigEndian", "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pw=MySecret", "-pf=COBS", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-triceEndianness=bigEndian", "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pw=MySecret", "-pf=COBS", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/be_staticB_di_xtea_cobs_rtt32/generated_cgoPackage.go b/_test/be_staticB_di_xtea_cobs_rtt32/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/be_staticB_di_xtea_cobs_rtt32/generated_cgoPackage.go +++ b/_test/be_staticB_di_xtea_cobs_rtt32/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/dblB_de_cobs_ua/cgo_test.go b/_test/dblB_de_cobs_ua/cgo_test.go index fadc575db..7b3011f9a 100644 --- a/_test/dblB_de_cobs_ua/cgo_test.go +++ b/_test/dblB_de_cobs_ua/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=COBS", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=COBS", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/dblB_de_cobs_ua/generated_cgoPackage.go b/_test/dblB_de_cobs_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/dblB_de_cobs_ua/generated_cgoPackage.go +++ b/_test/dblB_de_cobs_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/dblB_de_multi_cobs_ua/cgo_test.go b/_test/dblB_de_multi_cobs_ua/cgo_test.go index fadc575db..7b3011f9a 100644 --- a/_test/dblB_de_multi_cobs_ua/cgo_test.go +++ b/_test/dblB_de_multi_cobs_ua/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=COBS", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=COBS", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/dblB_de_multi_cobs_ua/generated_cgoPackage.go b/_test/dblB_de_multi_cobs_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/dblB_de_multi_cobs_ua/generated_cgoPackage.go +++ b/_test/dblB_de_multi_cobs_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/dblB_de_multi_nopf_ua/cgo_test.go b/_test/dblB_de_multi_nopf_ua/cgo_test.go index 6ee38b6ef..f025576b0 100644 --- a/_test/dblB_de_multi_nopf_ua/cgo_test.go +++ b/_test/dblB_de_multi_nopf_ua/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/dblB_de_multi_nopf_ua/generated_cgoPackage.go b/_test/dblB_de_multi_nopf_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/dblB_de_multi_nopf_ua/generated_cgoPackage.go +++ b/_test/dblB_de_multi_nopf_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/dblB_de_multi_tcobs_ua/cgo_test.go b/_test/dblB_de_multi_tcobs_ua/cgo_test.go index 11290949c..20a97d719 100644 --- a/_test/dblB_de_multi_tcobs_ua/cgo_test.go +++ b/_test/dblB_de_multi_tcobs_ua/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p", "BUFFER", "-args", buffer, "-hs", "off", "-prefix", "off", "-li", "off", "-color", "off", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p", "BUFFER", "-args", buffer, "-hs", "off", "-prefix", "off", "-li", "off", "-color", "off", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/dblB_de_multi_tcobs_ua/generated_cgoPackage.go b/_test/dblB_de_multi_tcobs_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/dblB_de_multi_tcobs_ua/generated_cgoPackage.go +++ b/_test/dblB_de_multi_tcobs_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/dblB_de_multi_xtea_cobs_ua/cgo_test.go b/_test/dblB_de_multi_xtea_cobs_ua/cgo_test.go index 6d19ffabf..602de9aca 100644 --- a/_test/dblB_de_multi_xtea_cobs_ua/cgo_test.go +++ b/_test/dblB_de_multi_xtea_cobs_ua/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=COBS", "-pw=MySecret", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=COBS", "-pw=MySecret", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/dblB_de_multi_xtea_cobs_ua/generated_cgoPackage.go b/_test/dblB_de_multi_xtea_cobs_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/dblB_de_multi_xtea_cobs_ua/generated_cgoPackage.go +++ b/_test/dblB_de_multi_xtea_cobs_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/dblB_de_multi_xtea_tcobs_ua/cgo_test.go b/_test/dblB_de_multi_xtea_tcobs_ua/cgo_test.go index f0b4169fc..61214ef2b 100644 --- a/_test/dblB_de_multi_xtea_tcobs_ua/cgo_test.go +++ b/_test/dblB_de_multi_xtea_tcobs_ua/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=TCOBS", "-pw=MySecret", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=TCOBS", "-pw=MySecret", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/dblB_de_multi_xtea_tcobs_ua/generated_cgoPackage.go b/_test/dblB_de_multi_xtea_tcobs_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/dblB_de_multi_xtea_tcobs_ua/generated_cgoPackage.go +++ b/_test/dblB_de_multi_xtea_tcobs_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/dblB_de_nopf_ua/cgo_test.go b/_test/dblB_de_nopf_ua/cgo_test.go index 6ee38b6ef..f025576b0 100644 --- a/_test/dblB_de_nopf_ua/cgo_test.go +++ b/_test/dblB_de_nopf_ua/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/dblB_de_nopf_ua/generated_cgoPackage.go b/_test/dblB_de_nopf_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/dblB_de_nopf_ua/generated_cgoPackage.go +++ b/_test/dblB_de_nopf_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/dblB_de_tcobs_ua/cgo_test.go b/_test/dblB_de_tcobs_ua/cgo_test.go index 00174122c..d063a3de6 100644 --- a/_test/dblB_de_tcobs_ua/cgo_test.go +++ b/_test/dblB_de_tcobs_ua/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/dblB_de_tcobs_ua/generated_cgoPackage.go b/_test/dblB_de_tcobs_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/dblB_de_tcobs_ua/generated_cgoPackage.go +++ b/_test/dblB_de_tcobs_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/dblB_de_xtea_cobs_ua/cgo_test.go b/_test/dblB_de_xtea_cobs_ua/cgo_test.go index 6d19ffabf..602de9aca 100644 --- a/_test/dblB_de_xtea_cobs_ua/cgo_test.go +++ b/_test/dblB_de_xtea_cobs_ua/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=COBS", "-pw=MySecret", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=COBS", "-pw=MySecret", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/dblB_de_xtea_cobs_ua/generated_cgoPackage.go b/_test/dblB_de_xtea_cobs_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/dblB_de_xtea_cobs_ua/generated_cgoPackage.go +++ b/_test/dblB_de_xtea_cobs_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/dblB_de_xtea_tcobs_ua/cgo_test.go b/_test/dblB_de_xtea_tcobs_ua/cgo_test.go index f0b4169fc..61214ef2b 100644 --- a/_test/dblB_de_xtea_tcobs_ua/cgo_test.go +++ b/_test/dblB_de_xtea_tcobs_ua/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=TCOBS", "-pw=MySecret", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=TCOBS", "-pw=MySecret", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/dblB_de_xtea_tcobs_ua/generated_cgoPackage.go b/_test/dblB_de_xtea_tcobs_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/dblB_de_xtea_tcobs_ua/generated_cgoPackage.go +++ b/_test/dblB_de_xtea_tcobs_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/dblB_di_nopf_rtt32__de_cobs_ua/cgo_test.go b/_test/dblB_di_nopf_rtt32__de_cobs_ua/cgo_test.go index 20b18fafb..bb06f6516 100644 --- a/_test/dblB_di_nopf_rtt32__de_cobs_ua/cgo_test.go +++ b/_test/dblB_di_nopf_rtt32__de_cobs_ua/cgo_test.go @@ -18,7 +18,7 @@ func TestLogs(t *testing.T) { // Default CLI switch values are not working in combined mode, set them explicit! triceLog0 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } @@ -27,7 +27,7 @@ func TestLogs(t *testing.T) { // Default CLI switch values are not working in combined mode, set them explicit! triceLog1 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=COBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=COBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/dblB_di_nopf_rtt32__de_cobs_ua/generated_cgoPackage.go b/_test/dblB_di_nopf_rtt32__de_cobs_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/dblB_di_nopf_rtt32__de_cobs_ua/generated_cgoPackage.go +++ b/_test/dblB_di_nopf_rtt32__de_cobs_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/dblB_di_nopf_rtt32__de_multi_cobs_ua/cgo_test.go b/_test/dblB_di_nopf_rtt32__de_multi_cobs_ua/cgo_test.go index 20b18fafb..bb06f6516 100644 --- a/_test/dblB_di_nopf_rtt32__de_multi_cobs_ua/cgo_test.go +++ b/_test/dblB_di_nopf_rtt32__de_multi_cobs_ua/cgo_test.go @@ -18,7 +18,7 @@ func TestLogs(t *testing.T) { // Default CLI switch values are not working in combined mode, set them explicit! triceLog0 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } @@ -27,7 +27,7 @@ func TestLogs(t *testing.T) { // Default CLI switch values are not working in combined mode, set them explicit! triceLog1 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=COBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=COBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/dblB_di_nopf_rtt32__de_multi_cobs_ua/generated_cgoPackage.go b/_test/dblB_di_nopf_rtt32__de_multi_cobs_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/dblB_di_nopf_rtt32__de_multi_cobs_ua/generated_cgoPackage.go +++ b/_test/dblB_di_nopf_rtt32__de_multi_cobs_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/dblB_di_nopf_rtt32__de_multi_tcobs_ua/cgo_test.go b/_test/dblB_di_nopf_rtt32__de_multi_tcobs_ua/cgo_test.go index 9fee95386..6779ce1e3 100644 --- a/_test/dblB_di_nopf_rtt32__de_multi_tcobs_ua/cgo_test.go +++ b/_test/dblB_di_nopf_rtt32__de_multi_tcobs_ua/cgo_test.go @@ -18,7 +18,7 @@ func TestLogs(t *testing.T) { // Default CLI switch values are not working in combined mode, set them explicit! triceLog0 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } @@ -27,7 +27,7 @@ func TestLogs(t *testing.T) { // Default CLI switch values are not working in combined mode, set them explicit! triceLog1 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=TCOBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=TCOBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/dblB_di_nopf_rtt32__de_multi_tcobs_ua/generated_cgoPackage.go b/_test/dblB_di_nopf_rtt32__de_multi_tcobs_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/dblB_di_nopf_rtt32__de_multi_tcobs_ua/generated_cgoPackage.go +++ b/_test/dblB_di_nopf_rtt32__de_multi_tcobs_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/dblB_di_nopf_rtt32__de_tcobs_ua/cgo_test.go b/_test/dblB_di_nopf_rtt32__de_tcobs_ua/cgo_test.go index 9fee95386..6779ce1e3 100644 --- a/_test/dblB_di_nopf_rtt32__de_tcobs_ua/cgo_test.go +++ b/_test/dblB_di_nopf_rtt32__de_tcobs_ua/cgo_test.go @@ -18,7 +18,7 @@ func TestLogs(t *testing.T) { // Default CLI switch values are not working in combined mode, set them explicit! triceLog0 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } @@ -27,7 +27,7 @@ func TestLogs(t *testing.T) { // Default CLI switch values are not working in combined mode, set them explicit! triceLog1 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=TCOBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=TCOBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/dblB_di_nopf_rtt32__de_tcobs_ua/generated_cgoPackage.go b/_test/dblB_di_nopf_rtt32__de_tcobs_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/dblB_di_nopf_rtt32__de_tcobs_ua/generated_cgoPackage.go +++ b/_test/dblB_di_nopf_rtt32__de_tcobs_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/dblB_di_nopf_rtt32__de_xtea_cobs_ua/cgo_test.go b/_test/dblB_di_nopf_rtt32__de_xtea_cobs_ua/cgo_test.go index bcf33ce4e..494ab8e41 100644 --- a/_test/dblB_di_nopf_rtt32__de_xtea_cobs_ua/cgo_test.go +++ b/_test/dblB_di_nopf_rtt32__de_xtea_cobs_ua/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog0 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } @@ -25,7 +25,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog1 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pw=MySecret", "-pf=COBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pw=MySecret", "-pf=COBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/dblB_di_nopf_rtt32__de_xtea_cobs_ua/generated_cgoPackage.go b/_test/dblB_di_nopf_rtt32__de_xtea_cobs_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/dblB_di_nopf_rtt32__de_xtea_cobs_ua/generated_cgoPackage.go +++ b/_test/dblB_di_nopf_rtt32__de_xtea_cobs_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/dblB_di_nopf_rtt8__de_cobs_ua/cgo_test.go b/_test/dblB_di_nopf_rtt8__de_cobs_ua/cgo_test.go index 20b18fafb..bb06f6516 100644 --- a/_test/dblB_di_nopf_rtt8__de_cobs_ua/cgo_test.go +++ b/_test/dblB_di_nopf_rtt8__de_cobs_ua/cgo_test.go @@ -18,7 +18,7 @@ func TestLogs(t *testing.T) { // Default CLI switch values are not working in combined mode, set them explicit! triceLog0 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } @@ -27,7 +27,7 @@ func TestLogs(t *testing.T) { // Default CLI switch values are not working in combined mode, set them explicit! triceLog1 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=COBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=COBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/dblB_di_nopf_rtt8__de_cobs_ua/generated_cgoPackage.go b/_test/dblB_di_nopf_rtt8__de_cobs_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/dblB_di_nopf_rtt8__de_cobs_ua/generated_cgoPackage.go +++ b/_test/dblB_di_nopf_rtt8__de_cobs_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/dblB_di_nopf_rtt8__de_multi_cobs_ua/cgo_test.go b/_test/dblB_di_nopf_rtt8__de_multi_cobs_ua/cgo_test.go index 20b18fafb..bb06f6516 100644 --- a/_test/dblB_di_nopf_rtt8__de_multi_cobs_ua/cgo_test.go +++ b/_test/dblB_di_nopf_rtt8__de_multi_cobs_ua/cgo_test.go @@ -18,7 +18,7 @@ func TestLogs(t *testing.T) { // Default CLI switch values are not working in combined mode, set them explicit! triceLog0 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } @@ -27,7 +27,7 @@ func TestLogs(t *testing.T) { // Default CLI switch values are not working in combined mode, set them explicit! triceLog1 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=COBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=COBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/dblB_di_nopf_rtt8__de_multi_cobs_ua/generated_cgoPackage.go b/_test/dblB_di_nopf_rtt8__de_multi_cobs_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/dblB_di_nopf_rtt8__de_multi_cobs_ua/generated_cgoPackage.go +++ b/_test/dblB_di_nopf_rtt8__de_multi_cobs_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/dblB_di_nopf_rtt8__de_multi_tcobs_ua/cgo_test.go b/_test/dblB_di_nopf_rtt8__de_multi_tcobs_ua/cgo_test.go index 9fee95386..6779ce1e3 100644 --- a/_test/dblB_di_nopf_rtt8__de_multi_tcobs_ua/cgo_test.go +++ b/_test/dblB_di_nopf_rtt8__de_multi_tcobs_ua/cgo_test.go @@ -18,7 +18,7 @@ func TestLogs(t *testing.T) { // Default CLI switch values are not working in combined mode, set them explicit! triceLog0 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } @@ -27,7 +27,7 @@ func TestLogs(t *testing.T) { // Default CLI switch values are not working in combined mode, set them explicit! triceLog1 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=TCOBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=TCOBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/dblB_di_nopf_rtt8__de_multi_tcobs_ua/generated_cgoPackage.go b/_test/dblB_di_nopf_rtt8__de_multi_tcobs_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/dblB_di_nopf_rtt8__de_multi_tcobs_ua/generated_cgoPackage.go +++ b/_test/dblB_di_nopf_rtt8__de_multi_tcobs_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/dblB_di_nopf_rtt8__de_tcobs_ua/cgo_test.go b/_test/dblB_di_nopf_rtt8__de_tcobs_ua/cgo_test.go index 9fee95386..6779ce1e3 100644 --- a/_test/dblB_di_nopf_rtt8__de_tcobs_ua/cgo_test.go +++ b/_test/dblB_di_nopf_rtt8__de_tcobs_ua/cgo_test.go @@ -18,7 +18,7 @@ func TestLogs(t *testing.T) { // Default CLI switch values are not working in combined mode, set them explicit! triceLog0 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } @@ -27,7 +27,7 @@ func TestLogs(t *testing.T) { // Default CLI switch values are not working in combined mode, set them explicit! triceLog1 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=TCOBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=TCOBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/dblB_di_nopf_rtt8__de_tcobs_ua/generated_cgoPackage.go b/_test/dblB_di_nopf_rtt8__de_tcobs_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/dblB_di_nopf_rtt8__de_tcobs_ua/generated_cgoPackage.go +++ b/_test/dblB_di_nopf_rtt8__de_tcobs_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/protect_dblB_de_tcobs_ua/cgo_test.go b/_test/protect_dblB_de_tcobs_ua/cgo_test.go index 943dba301..dd0b49702 100644 --- a/_test/protect_dblB_de_tcobs_ua/cgo_test.go +++ b/_test/protect_dblB_de_tcobs_ua/cgo_test.go @@ -18,7 +18,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=none", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=none", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } triceLogSpecialTest(t, triceLog) diff --git a/_test/protect_dblB_de_tcobs_ua/generated_cgoPackage.go b/_test/protect_dblB_de_tcobs_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/protect_dblB_de_tcobs_ua/generated_cgoPackage.go +++ b/_test/protect_dblB_de_tcobs_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/ringB_de_cobs_ua/cgo_test.go b/_test/ringB_de_cobs_ua/cgo_test.go index fadc575db..7b3011f9a 100644 --- a/_test/ringB_de_cobs_ua/cgo_test.go +++ b/_test/ringB_de_cobs_ua/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=COBS", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=COBS", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/ringB_de_cobs_ua/generated_cgoPackage.go b/_test/ringB_de_cobs_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/ringB_de_cobs_ua/generated_cgoPackage.go +++ b/_test/ringB_de_cobs_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/ringB_de_nopf_ua/cgo_test.go b/_test/ringB_de_nopf_ua/cgo_test.go index 6ee38b6ef..f025576b0 100644 --- a/_test/ringB_de_nopf_ua/cgo_test.go +++ b/_test/ringB_de_nopf_ua/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/ringB_de_nopf_ua/generated_cgoPackage.go b/_test/ringB_de_nopf_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/ringB_de_nopf_ua/generated_cgoPackage.go +++ b/_test/ringB_de_nopf_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/ringB_de_tcobs_ua/cgo_test.go b/_test/ringB_de_tcobs_ua/cgo_test.go index 00174122c..d063a3de6 100644 --- a/_test/ringB_de_tcobs_ua/cgo_test.go +++ b/_test/ringB_de_tcobs_ua/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/ringB_de_tcobs_ua/generated_cgoPackage.go b/_test/ringB_de_tcobs_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/ringB_de_tcobs_ua/generated_cgoPackage.go +++ b/_test/ringB_de_tcobs_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/ringB_de_xtea_cobs_ua/cgo_test.go b/_test/ringB_de_xtea_cobs_ua/cgo_test.go index 6d19ffabf..602de9aca 100644 --- a/_test/ringB_de_xtea_cobs_ua/cgo_test.go +++ b/_test/ringB_de_xtea_cobs_ua/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=COBS", "-pw=MySecret", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=COBS", "-pw=MySecret", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/ringB_de_xtea_cobs_ua/generated_cgoPackage.go b/_test/ringB_de_xtea_cobs_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/ringB_de_xtea_cobs_ua/generated_cgoPackage.go +++ b/_test/ringB_de_xtea_cobs_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/ringB_de_xtea_tcobs_ua/cgo_test.go b/_test/ringB_de_xtea_tcobs_ua/cgo_test.go index f0b4169fc..61214ef2b 100644 --- a/_test/ringB_de_xtea_tcobs_ua/cgo_test.go +++ b/_test/ringB_de_xtea_tcobs_ua/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=TCOBS", "-pw=MySecret", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=TCOBS", "-pw=MySecret", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/ringB_de_xtea_tcobs_ua/generated_cgoPackage.go b/_test/ringB_de_xtea_tcobs_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/ringB_de_xtea_tcobs_ua/generated_cgoPackage.go +++ b/_test/ringB_de_xtea_tcobs_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/ringB_di_cobs_rtt32__de_tcobs_ua/cgo_test.go b/_test/ringB_di_cobs_rtt32__de_tcobs_ua/cgo_test.go index b3304cbfd..e82b7bfaa 100644 --- a/_test/ringB_di_cobs_rtt32__de_tcobs_ua/cgo_test.go +++ b/_test/ringB_di_cobs_rtt32__de_tcobs_ua/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog0 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=COBS", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=COBS", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } @@ -25,7 +25,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog1 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=TCOBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=TCOBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/ringB_di_cobs_rtt32__de_tcobs_ua/generated_cgoPackage.go b/_test/ringB_di_cobs_rtt32__de_tcobs_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/ringB_di_cobs_rtt32__de_tcobs_ua/generated_cgoPackage.go +++ b/_test/ringB_di_cobs_rtt32__de_tcobs_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/ringB_di_cobs_rtt8__de_tcobs_ua/cgo_test.go b/_test/ringB_di_cobs_rtt8__de_tcobs_ua/cgo_test.go index b3304cbfd..e82b7bfaa 100644 --- a/_test/ringB_di_cobs_rtt8__de_tcobs_ua/cgo_test.go +++ b/_test/ringB_di_cobs_rtt8__de_tcobs_ua/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog0 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=COBS", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=COBS", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } @@ -25,7 +25,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog1 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=TCOBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=TCOBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/ringB_di_cobs_rtt8__de_tcobs_ua/generated_cgoPackage.go b/_test/ringB_di_cobs_rtt8__de_tcobs_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/ringB_di_cobs_rtt8__de_tcobs_ua/generated_cgoPackage.go +++ b/_test/ringB_di_cobs_rtt8__de_tcobs_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/ringB_di_nopf_rtt32__de_tcobs_ua/cgo_test.go b/_test/ringB_di_nopf_rtt32__de_tcobs_ua/cgo_test.go index eb75eb81f..cd82ef8f8 100644 --- a/_test/ringB_di_nopf_rtt32__de_tcobs_ua/cgo_test.go +++ b/_test/ringB_di_nopf_rtt32__de_tcobs_ua/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog0 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } @@ -25,7 +25,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog1 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=TCOBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=TCOBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/ringB_di_nopf_rtt32__de_tcobs_ua/generated_cgoPackage.go b/_test/ringB_di_nopf_rtt32__de_tcobs_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/ringB_di_nopf_rtt32__de_tcobs_ua/generated_cgoPackage.go +++ b/_test/ringB_di_nopf_rtt32__de_tcobs_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/ringB_di_nopf_rtt32__de_xtea_cobs_ua/cgo_test.go b/_test/ringB_di_nopf_rtt32__de_xtea_cobs_ua/cgo_test.go index bcf33ce4e..494ab8e41 100644 --- a/_test/ringB_di_nopf_rtt32__de_xtea_cobs_ua/cgo_test.go +++ b/_test/ringB_di_nopf_rtt32__de_xtea_cobs_ua/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog0 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } @@ -25,7 +25,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog1 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pw=MySecret", "-pf=COBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pw=MySecret", "-pf=COBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/ringB_di_nopf_rtt32__de_xtea_cobs_ua/generated_cgoPackage.go b/_test/ringB_di_nopf_rtt32__de_xtea_cobs_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/ringB_di_nopf_rtt32__de_xtea_cobs_ua/generated_cgoPackage.go +++ b/_test/ringB_di_nopf_rtt32__de_xtea_cobs_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/ringB_di_nopf_rtt8__de_tcobs_ua/cgo_test.go b/_test/ringB_di_nopf_rtt8__de_tcobs_ua/cgo_test.go index eb75eb81f..cd82ef8f8 100644 --- a/_test/ringB_di_nopf_rtt8__de_tcobs_ua/cgo_test.go +++ b/_test/ringB_di_nopf_rtt8__de_tcobs_ua/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog0 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } @@ -25,7 +25,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog1 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=TCOBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=TCOBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/ringB_di_nopf_rtt8__de_tcobs_ua/generated_cgoPackage.go b/_test/ringB_di_nopf_rtt8__de_tcobs_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/ringB_di_nopf_rtt8__de_tcobs_ua/generated_cgoPackage.go +++ b/_test/ringB_di_nopf_rtt8__de_tcobs_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/ringB_di_tcobs_rtt32__de_tcobs_ua/cgo_test.go b/_test/ringB_di_tcobs_rtt32__de_tcobs_ua/cgo_test.go index afc76ba95..264a43d8c 100644 --- a/_test/ringB_di_tcobs_rtt32__de_tcobs_ua/cgo_test.go +++ b/_test/ringB_di_tcobs_rtt32__de_tcobs_ua/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog0 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=TCOBS", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=TCOBS", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } @@ -25,7 +25,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog1 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=TCOBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=TCOBS", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/ringB_di_tcobs_rtt32__de_tcobs_ua/generated_cgoPackage.go b/_test/ringB_di_tcobs_rtt32__de_tcobs_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/ringB_di_tcobs_rtt32__de_tcobs_ua/generated_cgoPackage.go +++ b/_test/ringB_di_tcobs_rtt32__de_tcobs_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/ringB_di_xtea_cobs_rtt32__de_xtea_cobs_ua/cgo_test.go b/_test/ringB_di_xtea_cobs_rtt32__de_xtea_cobs_ua/cgo_test.go index b09ff9a9f..3e9762562 100644 --- a/_test/ringB_di_xtea_cobs_rtt32__de_xtea_cobs_ua/cgo_test.go +++ b/_test/ringB_di_xtea_cobs_rtt32__de_xtea_cobs_ua/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog0 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=COBS", "-pw=MySecret", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=COBS", "-pw=MySecret", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } @@ -25,7 +25,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog1 := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=COBS", "-pw=MySecret", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=COBS", "-pw=MySecret", "-d16=false", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/ringB_di_xtea_cobs_rtt32__de_xtea_cobs_ua/generated_cgoPackage.go b/_test/ringB_di_xtea_cobs_rtt32__de_xtea_cobs_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/ringB_di_xtea_cobs_rtt32__de_xtea_cobs_ua/generated_cgoPackage.go +++ b/_test/ringB_di_xtea_cobs_rtt32__de_xtea_cobs_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/ringB_protect_de_tcobs_ua/cgo_test.go b/_test/ringB_protect_de_tcobs_ua/cgo_test.go index 88891fe9e..c255310e6 100644 --- a/_test/ringB_protect_de_tcobs_ua/cgo_test.go +++ b/_test/ringB_protect_de_tcobs_ua/cgo_test.go @@ -18,7 +18,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=none", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=none", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } triceLogSpecialTest(t, triceLog) diff --git a/_test/ringB_protect_de_tcobs_ua/generated_cgoPackage.go b/_test/ringB_protect_de_tcobs_ua/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/ringB_protect_de_tcobs_ua/generated_cgoPackage.go +++ b/_test/ringB_protect_de_tcobs_ua/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/stackB_di_nopf_aux32/cgo_test.go b/_test/stackB_di_nopf_aux32/cgo_test.go index fc8ea4248..00d8a117f 100644 --- a/_test/stackB_di_nopf_aux32/cgo_test.go +++ b/_test/stackB_di_nopf_aux32/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/stackB_di_nopf_aux32/generated_cgoPackage.go b/_test/stackB_di_nopf_aux32/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/stackB_di_nopf_aux32/generated_cgoPackage.go +++ b/_test/stackB_di_nopf_aux32/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/stackB_di_nopf_aux8/cgo_test.go b/_test/stackB_di_nopf_aux8/cgo_test.go index fc8ea4248..00d8a117f 100644 --- a/_test/stackB_di_nopf_aux8/cgo_test.go +++ b/_test/stackB_di_nopf_aux8/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/stackB_di_nopf_aux8/generated_cgoPackage.go b/_test/stackB_di_nopf_aux8/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/stackB_di_nopf_aux8/generated_cgoPackage.go +++ b/_test/stackB_di_nopf_aux8/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/stackB_di_nopf_rtt32/cgo_test.go b/_test/stackB_di_nopf_rtt32/cgo_test.go index fc8ea4248..00d8a117f 100644 --- a/_test/stackB_di_nopf_rtt32/cgo_test.go +++ b/_test/stackB_di_nopf_rtt32/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/stackB_di_nopf_rtt32/generated_cgoPackage.go b/_test/stackB_di_nopf_rtt32/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/stackB_di_nopf_rtt32/generated_cgoPackage.go +++ b/_test/stackB_di_nopf_rtt32/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/stackB_di_nopf_rtt8/cgo_test.go b/_test/stackB_di_nopf_rtt8/cgo_test.go index fc8ea4248..00d8a117f 100644 --- a/_test/stackB_di_nopf_rtt8/cgo_test.go +++ b/_test/stackB_di_nopf_rtt8/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/stackB_di_nopf_rtt8/generated_cgoPackage.go b/_test/stackB_di_nopf_rtt8/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/stackB_di_nopf_rtt8/generated_cgoPackage.go +++ b/_test/stackB_di_nopf_rtt8/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/stackB_di_xtea_cobs_rtt8/cgo_test.go b/_test/stackB_di_xtea_cobs_rtt8/cgo_test.go index c54651ddf..e8d292c8b 100644 --- a/_test/stackB_di_xtea_cobs_rtt8/cgo_test.go +++ b/_test/stackB_di_xtea_cobs_rtt8/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pw=MySecret", "-pf=COBS", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pw=MySecret", "-pf=COBS", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/stackB_di_xtea_cobs_rtt8/generated_cgoPackage.go b/_test/stackB_di_xtea_cobs_rtt8/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/stackB_di_xtea_cobs_rtt8/generated_cgoPackage.go +++ b/_test/stackB_di_xtea_cobs_rtt8/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/staticB_di_nopf_aux32/cgo_test.go b/_test/staticB_di_nopf_aux32/cgo_test.go index fc8ea4248..00d8a117f 100644 --- a/_test/staticB_di_nopf_aux32/cgo_test.go +++ b/_test/staticB_di_nopf_aux32/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/staticB_di_nopf_aux32/generated_cgoPackage.go b/_test/staticB_di_nopf_aux32/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/staticB_di_nopf_aux32/generated_cgoPackage.go +++ b/_test/staticB_di_nopf_aux32/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/staticB_di_nopf_aux8/cgo_test.go b/_test/staticB_di_nopf_aux8/cgo_test.go index fc8ea4248..00d8a117f 100644 --- a/_test/staticB_di_nopf_aux8/cgo_test.go +++ b/_test/staticB_di_nopf_aux8/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/staticB_di_nopf_aux8/generated_cgoPackage.go b/_test/staticB_di_nopf_aux8/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/staticB_di_nopf_aux8/generated_cgoPackage.go +++ b/_test/staticB_di_nopf_aux8/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/staticB_di_nopf_rtt32/cgo_test.go b/_test/staticB_di_nopf_rtt32/cgo_test.go index fc8ea4248..00d8a117f 100644 --- a/_test/staticB_di_nopf_rtt32/cgo_test.go +++ b/_test/staticB_di_nopf_rtt32/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/staticB_di_nopf_rtt32/generated_cgoPackage.go b/_test/staticB_di_nopf_rtt32/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/staticB_di_nopf_rtt32/generated_cgoPackage.go +++ b/_test/staticB_di_nopf_rtt32/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/staticB_di_nopf_rtt8/cgo_test.go b/_test/staticB_di_nopf_rtt8/cgo_test.go index fc8ea4248..00d8a117f 100644 --- a/_test/staticB_di_nopf_rtt8/cgo_test.go +++ b/_test/staticB_di_nopf_rtt8/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=NONE", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/staticB_di_nopf_rtt8/generated_cgoPackage.go b/_test/staticB_di_nopf_rtt8/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/staticB_di_nopf_rtt8/generated_cgoPackage.go +++ b/_test/staticB_di_nopf_rtt8/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/staticB_di_tcobs_rtt32/cgo_test.go b/_test/staticB_di_tcobs_rtt32/cgo_test.go index 61c2ca301..bb61e645c 100644 --- a/_test/staticB_di_tcobs_rtt32/cgo_test.go +++ b/_test/staticB_di_tcobs_rtt32/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=TCOBS", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=TCOBS", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/staticB_di_tcobs_rtt32/generated_cgoPackage.go b/_test/staticB_di_tcobs_rtt32/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/staticB_di_tcobs_rtt32/generated_cgoPackage.go +++ b/_test/staticB_di_tcobs_rtt32/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/staticB_di_tcobs_rtt8/cgo_test.go b/_test/staticB_di_tcobs_rtt8/cgo_test.go index 61c2ca301..bb61e645c 100644 --- a/_test/staticB_di_tcobs_rtt8/cgo_test.go +++ b/_test/staticB_di_tcobs_rtt8/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=TCOBS", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pf=TCOBS", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/staticB_di_tcobs_rtt8/generated_cgoPackage.go b/_test/staticB_di_tcobs_rtt8/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/staticB_di_tcobs_rtt8/generated_cgoPackage.go +++ b/_test/staticB_di_tcobs_rtt8/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/staticB_di_xtea_cobs_rtt32/cgo_test.go b/_test/staticB_di_xtea_cobs_rtt32/cgo_test.go index c54651ddf..e8d292c8b 100644 --- a/_test/staticB_di_xtea_cobs_rtt32/cgo_test.go +++ b/_test/staticB_di_xtea_cobs_rtt32/cgo_test.go @@ -17,7 +17,7 @@ func TestLogs(t *testing.T) { // It uses the inside fSys specified til.json and returns the log output. triceLog := func(t *testing.T, fSys *afero.Afero, buffer string) string { var o bytes.Buffer - assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pw=MySecret", "-pf=COBS", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) + assert.Nil(t, args.Handler(io.Writer(&o), fSys, []string{"trice", "log", "-i", path.Join(triceDir, "/_test/testdata/til.json"), "-p=BUFFER", "-args", buffer, "-hs=off", "-prefix=off", "-li=off", "-color=off", "-pw=MySecret", "-pf=COBS", "-d16", "-ts16", "time: %04x", "-ts32", "time:%08x"})) return o.String() } diff --git a/_test/staticB_di_xtea_cobs_rtt32/generated_cgoPackage.go b/_test/staticB_di_xtea_cobs_rtt32/generated_cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/staticB_di_xtea_cobs_rtt32/generated_cgoPackage.go +++ b/_test/staticB_di_xtea_cobs_rtt32/generated_cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/_test/testdata/cgoPackage.go b/_test/testdata/cgoPackage.go index e96bbff8d..93f924427 100644 --- a/_test/testdata/cgoPackage.go +++ b/_test/testdata/cgoPackage.go @@ -139,7 +139,7 @@ func getExpectedResults(fSys *afero.Afero, filename string) (result []results) { // It uses the inside fSys specified til.json and returns the log output. type logF func(t *testing.T, fSys *afero.Afero, buffer string) string -// triceLogTest creates a list of expected results from path.Join(triceDir, "./test/testdata/triceCheck.c"). +// triceLogTest creates a list of expected results from path.Join(triceDir, "./_test/testdata/triceCheck.c"). // It loops over the result list and executes for each result the compiled C-code. // It passes the received binary data as buffer to the triceLog function of type logF. // This function is test package specific defined. The file cgoPackage.go is @@ -155,7 +155,7 @@ func triceLogTest(t *testing.T, triceLog logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { @@ -194,7 +194,7 @@ func triceLogTest2(t *testing.T, triceLog0, triceLog1 logF, limit int) { out := make([]byte, 32768) setTriceBuffer(out) - result := getExpectedResults(osFSys, path.Join(triceDir, "./test/testdata/triceCheck.c")) + result := getExpectedResults(osFSys, path.Join(triceDir, "./_test/testdata/triceCheck.c")) var count int for i, r := range result { diff --git a/docs/TraceWithTrice.md b/docs/TraceWithTrice.md index 0d4688bea..e02b90661 100644 --- a/docs/TraceWithTrice.md +++ b/docs/TraceWithTrice.md @@ -45,7 +45,7 @@ *Trice* is an unusual software tracer-logger and consists of these parts to use: -- [x] [trice.c](../pkg/src/trice.c) containing the [less that 1KB](./TriceSpace.md) runtime code using [triceConfig.h](../test/F030R8/Core/Inc/triceConfig.h) as setup. +- [x] [trice.c](../pkg/src/trice.c) containing the [less that 1KB](./TriceSpace.md) runtime code using [triceConfig.h](../_test/F030R8/Core/Inc/triceConfig.h) as setup. - [x] [trice.h](../pkg/src/trice.h) containing a **C** language macro `TRICE`, generating [tiny code](./TriceSpeed.md) for getting real-time `printf` comfort at "speed-of-light" for any micro-controller. * [x] Example: `float x = 3.14159265/4; TRICE( Id(12345), "info:π/4 is %f with the bit pattern %032b\n", aFloat(x), x );` - [x] PC tool **trice**, executable on all [Go](https://golang.org) platforms: @@ -166,7 +166,7 @@ After debugging code in a file, there is [no need to remove or comment out `TRIC ### 5.9. Target and host timestamps -Enable target timestamps with a variable you want inside [triceConfig.h](../test/F030R8/Core/Inc/triceConfig.h). This adds a 32-bit value to each *Trice* sequence, which carries than the system clock, a millisecond second or an other event counter. The **trice** tool will automatically recognize and display them in a default mode you can control. If several `TRICE` macros form a single line, the **trice** tool only displays the target timestamp of the first `TRICE` macro. +Enable target timestamps with a variable you want inside [triceConfig.h](../_test/F030R8/Core/Inc/triceConfig.h). This adds a 32-bit value to each *Trice* sequence, which carries than the system clock, a millisecond second or an other event counter. The **trice** tool will automatically recognize and display them in a default mode you can control. If several `TRICE` macros form a single line, the **trice** tool only displays the target timestamp of the first `TRICE` macro. Embedded devices often lack a real-time clock and some scenarios can last for weeks. Therefore the **trice** tool precedes each *Trice* line with a PC timestamp, if not disabled. This is the *Trice* reception time on the PC, what can be some milliseconds later than the target *Trice* event. @@ -200,7 +200,7 @@ Using no framing, [COBS](https://en.wikipedia.org/wiki/Consistent_Overhead_Byte_ The **trice** tool is expandable with several decoders. So it is possible to implement a minimal *Trice* encoding, if bandwidth matters heavily and control that with switches. -When less RAM usage is more important the target double buffer is replaceable with a ring buffer. So the user will be able to decide at compile time about that. A ring buffer mode is selectable inside [triceConfig.h](../test/F030R8/Core/Inc/triceConfig.h) avoiding any buffer by paying a time toll. +When less RAM usage is more important the target double buffer is replaceable with a ring buffer. So the user will be able to decide at compile time about that. A ring buffer mode is selectable inside [triceConfig.h](../_test/F030R8/Core/Inc/triceConfig.h) avoiding any buffer by paying a time toll. The **trice** tool supports [many command line switches](./TriceUserGuide.md#9-options-for-trice-tool). diff --git a/docs/TriceColor.md b/docs/TriceColor.md index eaa06fe6f..3cfbd4438 100644 --- a/docs/TriceColor.md +++ b/docs/TriceColor.md @@ -21,7 +21,7 @@ ![./ref/COLOR_output.PNG](./ref/COLOR_output.PNG) -* [../test/testdata/triceCheck.c](../test/testdata/triceCheck.c) contains the code for this example. +* [../_test/testdata/triceCheck.c](../_test/testdata/triceCheck.c) contains the code for this example. * The **trice** tool, if knowing `wrn:` as pattern, prepends the appropriate color code. It removes the sequence `wrn:`, if it is known and completely lower case. * The user can define any pattern with any color code to create colored output with the **trice** tool. * There is no channel enable switch inside the target code. It would need a back channel and add overhead. diff --git a/docs/TriceOverRTT.md b/docs/TriceOverRTT.md index 052366178..4bca7ee03 100644 --- a/docs/TriceOverRTT.md +++ b/docs/TriceOverRTT.md @@ -223,8 +223,8 @@ In this **G0B1_inst** example we use the additional `-d16` and `-pf none` switch * Download [J-Link Software and Documentation Pack](https://www.segger.com/downloads/jlink/#J-LinkSoftwareAndDocumentationPack) and install. * You may need to add `C:\Program Files\SEGGER\JLink` to the %PATH% variable. * Tested with [NUCLEO64-STM32F030R8 evaluation board](https://www.st.com/en/evaluation-tools/nucleo-f030r8.html). -* For example: Compile and flash `../test/MDK-ARM_STM32F030R8` project. - * Check in [../test/MDK-ARM_STM32F030R8/Core/Inc/triceConfig.h](../test/MDK-ARM_STM32F030R8/Core/Inc/triceConfig.h) if `#define TRICE_RTT_CHANNEL 0` is set as output option. +* For example: Compile and flash `../_test/MDK-ARM_STM32F030R8` project. + * Check in [../_test/MDK-ARM_STM32F030R8/Core/Inc/triceConfig.h](../_test/MDK-ARM_STM32F030R8/Core/Inc/triceConfig.h) if `#define TRICE_RTT_CHANNEL 0` is set as output option. #### 4.2.1. JLink.exe @@ -318,7 +318,7 @@ In this **G0B1_inst** example we use the additional `-d16` and `-pf none` switch * No `TriceTransfer()` nor any interrupt is needed in the background * No UART or other output is needed * This is, because automatically done by SeggerRTT. This way one can debug code as comfortable as with `printf()` but with all the TRICE advantages. Have a look here: ![SeggerRTTD.gif](./ref/JLINK-DebugSession.gif) -* Avoid trice buffering inside target and write with TRICE macro directly into the RTT buffer (direct *Trice* mode = `#define TRICE_MODE 0` inside [triceConfig.h](../test/MDK-ARM_STM32F030R8/Core/Inc/triceConfig.h)). +* Avoid trice buffering inside target and write with TRICE macro directly into the RTT buffer (direct *Trice* mode = `#define TRICE_MODE 0` inside [triceConfig.h](../_test/MDK-ARM_STM32F030R8/Core/Inc/triceConfig.h)). * Write the bytes per *Trice* directly (little time & some space overhead on target, but no changes on host side) ![triceBlockDiagramWithSeggerRTT.svg](./ref/triceBlockDiagramWithSeggerRTTD.svg) diff --git a/docs/TriceUserGuide.md b/docs/TriceUserGuide.md index 24c3fd07b..91810924a 100644 --- a/docs/TriceUserGuide.md +++ b/docs/TriceUserGuide.md @@ -157,7 +157,7 @@ int tryIt( void ){ } ``` -You can also edit any of your existing project files accordingly. Just replace any `printf` with `trice`. (Handle float or double numbers and runtime-generated stings, according to [TriceVsPrintfSimilaritiesAndDifferences.md](./TriceVsPrintfSimilaritiesAndDifferences.md). The file [./test/testdata/triceCheck.c](../test/testdata/triceCheck.c) shows many usage examples. +You can also edit any of your existing project files accordingly. Just replace any `printf` with `trice`. (Handle float or double numbers and runtime-generated stings, according to [TriceVsPrintfSimilaritiesAndDifferences.md](./TriceVsPrintfSimilaritiesAndDifferences.md). The file [./_test/testdata/triceCheck.c](../_test/testdata/triceCheck.c) shows many usage examples. The uppercase `TRICE` macros are inlining the complete Trice code and the lowercase `trice` macros are function calls, so most probably you want use `trice` to keep the overall code size smaller. - Create 2 empty files `til.json` and `li.json` in your project root. @@ -167,7 +167,7 @@ The uppercase `TRICE` macros are inlining the complete Trice code and the lowerc You can use `trice insert` as pre- and `trice clean` as post-compile step, to not spoil your source code with IDs. Or, use `trice insert` in a post-checkout and `trice clean` in a pre-check-in script to keep the repository clean. Using only `trice insert` as pre-compile step is possible too, especially when the code is used just in a single project and you wish to have it as compiled. -When using Trice in libraries for several projects, it may make sense to check-in the libraries with IDs and to use a dedicated ID space for them. See [../test/testdata/triceCheck.c](../test/testdata/triceCheck.c) as an example - especially when building several projects parallel like shown in the examples folder. +When using Trice in libraries for several projects, it may make sense to check-in the libraries with IDs and to use a dedicated ID space for them. See [../_test/testdata/triceCheck.c](../_test/testdata/triceCheck.c) as an example - especially when building several projects parallel like shown in the examples folder. A quick setup is possible when using RTT as output channel. Otherwise you need to setup a serial port for Trice data transmission. Other output paths possible too using the auxilary interface. ### 2.4. Use It @@ -276,7 +276,7 @@ _Hint:_ I usually have the 32-bit timestamp as millisecond counter and the 16-bi #### 2.5.3. Trice Checks -- Optionally copy parts of [./test/testdata/triceCheck.c](../test/testdata/triceCheck.c) to your project if you wish to perform some checks. +- Optionally copy parts of [./_test/testdata/triceCheck.c](../_test/testdata/triceCheck.c) to your project if you wish to perform some checks. - Do not inlucde this file directly, because it could get changed when `updateTestData.sh` is executed inside the `./test` folder. - The only-uppercase `TRICE*` macros include trice code sequences what can led to a significant code amount if you use plenty of them, whereas the lowercase macros `trice`, `Trice`, `TRice` and their relatives are just function calls and better suited to be used normally. - In your source files add line `#include "trice.h"` at the top. @@ -584,13 +584,13 @@ Afterwards you should find an executable `trice` inside $GOPATH/bin/ and you can Check comments inside [./src/triceDefaultConfig.h](.src/triceDefaultConfig.h) and adapt your project configuration like shown in [triceConfig.h](../examples/F030R8_inst/Core/Inc/triceConfig.h) as example.