diff options
| author | Arne Juul <arnej@yahooinc.com> | 2022-08-18 10:41:49 +0000 |
|---|---|---|
| committer | Arne Juul <arnej@yahooinc.com> | 2022-08-18 10:41:49 +0000 |
| commit | 9fd9e60dec70ab83154bdbe9cd7dba7dfac2449e (patch) | |
| tree | 2614c4b07a5c645e8ad2673ffd000a7dfde93193 /client | |
| parent | 4c80fc1991a3ff8cc605ef9c1e1684d055f1f9a7 (diff) | |
Reapply "Arnej/use go logfmt"
This reverts commit ebf0b7e6b37a0674da370c5fe0057f1aeac1d5a0.
Diffstat (limited to 'client')
| -rw-r--r-- | client/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | client/go/.gitignore | 1 | ||||
| -rw-r--r-- | client/go/Makefile | 3 |
3 files changed, 17 insertions, 1 deletions
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt new file mode 100644 index 00000000000..1ca6d2b4e60 --- /dev/null +++ b/client/CMakeLists.txt @@ -0,0 +1,14 @@ +# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. + +set(GODIR ${CMAKE_CURRENT_SOURCE_DIR}/go) + +file(GLOB_RECURSE GOSRCFILES ${GODIR}/*.go) + +add_custom_command(OUTPUT ${GODIR}/bin/vespa-logfmt + COMMAND make + DEPENDS ${GODIR}/Makefile ${GOSRCFILES} + WORKING_DIRECTORY ${GODIR}) + +add_custom_target(vespalog_logfmt ALL DEPENDS ${GODIR}/bin/vespa-logfmt) + +install(PROGRAMS ${GODIR}/bin/vespa-logfmt DESTINATION bin) diff --git a/client/go/.gitignore b/client/go/.gitignore index 8933bc220cb..baab7c638c6 100644 --- a/client/go/.gitignore +++ b/client/go/.gitignore @@ -6,3 +6,4 @@ share/ !target/ mytestapp/ mytestapp-cache/ +mytmp/ diff --git a/client/go/Makefile b/client/go/Makefile index 78adf299f0e..8a07f880c24 100644 --- a/client/go/Makefile +++ b/client/go/Makefile @@ -131,7 +131,8 @@ clean: rmdir -p $(BIN) $(SHARE)/man/man1 > /dev/null 2>&1 || true test: ci - go test ./... + mkdir -p mytmp + TMPDIR=`pwd`/mytmp go test ./... checkfmt: @bash -c "diff --line-format='%L' <(echo -n) <(gofmt -l .)" || { echo "one or more files need to be formatted: try make fmt to fix this automatically"; exit 1; } |