From 2ae2ebe2a5ac712db6f9221cb1ad8cfa76aad180 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 14 Aug 2022 20:52:06 -0600 Subject: Makefile: Add tools for diffing borrowed files against upstream --- .gitignore | 5 +++++ Makefile | 23 +++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4eea0ac --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +/stock/ +/stock.tmp/ +/patched/ +/patched.tmp/ +/borrowed.patch diff --git a/Makefile b/Makefile index d825ce9..652906d 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,8 @@ # # SPDX-License-Identifier: GPL-2.0-or-later +SHELL = bash + # main check: @@ -50,3 +52,24 @@ go-mod-tidy/tools/%: tools/src/%/go.mod rm -f tools/src/$*/go.sum cd tools/src/$* && go mod tidy -go $(goversion) -compat $(goversion) .PHONY: go-mod-tidy/tools/% + +# utilities for managing borrowed tests + +borrowed.patch: stock patched + diff -ru $^ > $@ || true +stock: FORCE + rm -rf $@ $@.tmp + mkdir $@.tmp + echo module ignore > $@.tmp/go.mod + set -e; for file in "$$(go env GOROOT)"/src/encoding/json/{*_test.go,tags.go}; do \ + cp "$$file" $@.tmp/borrowed_$${file##*/}; \ + done + mv $@.tmp $@ +patched: FORCE + rm -rf $@ $@.tmp + mkdir $@.tmp + echo module ignore > $@.tmp/go.mod + cp $$(git ls-files :*/borrowed_*.go :borrowed_*.go :!borrowed_misc.go :!*/borrowed_misc.go) $@.tmp + mv $@.tmp $@ + +.PHONY: FORCE -- cgit v1.2.3-2-g168b