diff options
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, 1 insertions, 17 deletions
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt deleted file mode 100644 index 1ca6d2b4e60..00000000000 --- a/client/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -# 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 baab7c638c6..8933bc220cb 100644 --- a/client/go/.gitignore +++ b/client/go/.gitignore @@ -6,4 +6,3 @@ share/ !target/ mytestapp/ mytestapp-cache/ -mytmp/ diff --git a/client/go/Makefile b/client/go/Makefile index 8a07f880c24..78adf299f0e 100644 --- a/client/go/Makefile +++ b/client/go/Makefile @@ -131,8 +131,7 @@ clean: rmdir -p $(BIN) $(SHARE)/man/man1 > /dev/null 2>&1 || true test: ci - mkdir -p mytmp - TMPDIR=`pwd`/mytmp go test ./... + 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; } |