Skip to content

Commit

Permalink
Squashed 'build-aux/' changes from 23d7189..be41763
Browse files Browse the repository at this point in the history
be41763 Merge pull request #15 from datawire/lukeshu/go1.13
09ecf9c go-mod.mk: Factor out common bits from the 1.12 and 1.13 modes
9c24dec go-mod.mk: Make the Go 1.13 and Go <1.13 build rules more similar
7cfce73 go-mod.mk: Fix triggering go-get with Go 1.13
89c0088 go-mod.mk: Add a test that it triggers go-get properly [ci-skip]
ac7f96d go-mod.mk: Drop the public go.bin.rule function
6c86efb Merge pull request #14 from datawire/lukeshu/go1.13
60e85c8 go-mod.mk: Do smarter things if Go 1.13 is available
d8ce0e4 Merge pull request #13 from datawire/lukeshu/teleproxy
9508f4d teleproxy.mk: Fix needing sudo each time
9525e77 teleproxy.mk: Add a failing test about needing sudo [ci-skip]
878377f Merge pull request #12 from datawire/lukeshu/teleproxy
19c32b5 teleproxy.mk: Re-add CGO_ENABLED fix for macOS
f81fbde teleproxy.mk: Add a test that it works with CGO_ENABLED=0 in the Makefile [ci-skip]
999e1b9 tests/common.bash: Copy build-aux instead of symlinking it
eced369 Merge pull request #11 from datawire/lukeshu/tests
87c7467 prelude.mk: Speed things up on Make 3.81
6eec61f build-aux/CHANGELOG.md: Fix typo
3ea1603 go-mod.mk: Add more tests (and fix discovered issues)
6a9751e build-aux/tests/: Add basic checks for all Executables
a66e1bc build-aux/.circleci: Use proxy.golang.org by default
cb9615f prelude_go.mk: Better version checking
d0b3ed4 prelude_uint.mk: Add, with unsigned integer comparison functions
5311af3 prelude_str.mk: Add a 'str.eq' function
6d78aac prelude_bool.mk: Add
049918e build-aux/.circleci: Add more build environments
965242e prelude.mk: Work around memory corruption bug in Make 3.81
45ed837 build-aux/.circleci: Add
d20d098 prelude.mk: Use BATS to write bunch of tests
3168a93 prelude.mk: Think about the dependencies that $(FLOCK) introduces
4c113c2 prelude.mk: Split in to multiple files
ebc092b (apro) Merge commit 'f981511cbfa3b0f05a9de5b0cb68c1fd4b3be740' into lukeshu/release
a4a1631 (ambex) go-mod.mk: Fix race
4a1ce31 (apro) build-aux: Make everything `SHELL = sh -o pipefail` friendly
9ddbfdc (apro) build-aux/docs/testing.md: We don't use patter anymore; update example
824c4ef (apro) docker.mk: Dang it, I broke `make release`
abeccac (apro) Fix `make clobber`, add a CI check to avoid it breaking again
d7ffbe2 (apro) build-aux: Doc changes suggested by Abhay
8dfef2a (apro) Merge branch 'tmp' into lukeshu/build-aux-docker
fa4024c (apro) Merge commit '2b2715eb2069f930af25e444554315752a093d53' into tmp
31fe448 (teleproxy) build-aux: Avoid needing things in build-aux/bin/ during clean & clobber
5093ec0 (teleproxy) build-aux/CHANGELOG.md: Update, fix typo
ae23ed0 (apro) docker.mk: Try to build with --pull if possible
9a7cca6 (apro) go-mod.mk: Don't forget to prune Go modules in git submodules
e393331 (apro) docker.mk: Allow overriding the tag expression on a per-image basis
22d1751 (apro) build-aux: [BREAKING CHANGE] Rethink how docker.mk and docker-cluster.mk tag and push things
90bd697 (apro) build-aux: [BREAKING CHANGE] Move kubernaut stuff from docker.mk to docker-cluster.mk
0a01be4 (apro) build-aux: Avoid needing things in build-aux/bin/ during clean & clobber
9f0728b (apro) build-aux: [BREAKING CHANGE] Have per-binary dependency listings for build-aux/bin-go/
cdf5d82 (apro) build-aux/CHANGELOG.md: Update, fix typo
55fac05 (apro) Merge commit '615fb2e533f428ee0808047d341f39af70e72a80' into lukeshu/build-aux
c354a5f (apro) go-mod.mk: Properly trigger .opensource.tar.gz rebuilds
4a81d1e (apro) teleproxy.mk: Fix on macOS
fdb60be (apro) Merge pull request #258 from datawire/lukeshu/make-fast
8bafc91 (apro) Merge remote-tracking branch 'origin/master' into lukeshu/make-fast
0f2eb69 (apro) Merge remote-tracking branch 'origin/master' into lukeshu/load-testing
09b5c5d (apro) Make the './bin' alias suggested by Bozo
ef6bbc7 (apro) Merge remote-tracking branch 'origin/master' into lukeshu/make-fast-v2
c14c4c4 (apro) docker-registry.yaml: Bump the PVC size 1GiB → 10GiB
2a96508 (apro) docker.mk: Fix typo
9fa43c3 (ambassador) build-aux: Add var.mk
df4f398 (apro) MacOs cp does not have -T and -t options
2bddab2 (apro) Use gnu-getopt on macOs
757687e (apro) Arrange for ssh-agent forwarding for docker on OSX

git-subtree-dir: build-aux
git-subtree-split: be41763
  • Loading branch information
LukeShu committed Sep 23, 2019
1 parent 95f51a8 commit 1c3ce34
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
Binary file added docker-cluster-macos-insecure-registries.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 12 additions & 3 deletions testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,17 @@ would write:

If your test framework of choice doesn't support TAP output, you can
pipe it to a helper program that can translate it. For example, `go
test` doesn't support TAP output, but `go test -v` output is parsable,
so we pipe that to [patter][patter], which translates it to TAP.
test` doesn't support TAP output, but `go test -json` output is
parsable, so we pipe that to [gotest2tap][gotest2tap], which
translates it to TAP.

If you set `SHELL = sh -o pipefail` in your `Makefile` (the pros and
cons of which I won't comment on here), you should be sure that if
your test-runner indicates success or failure with an exit code, that
you ignore that exit code:

%.tap: %.bats $(TAP_DRIVER) FORCE
@{ bats --tap $< || true; } | tee $@ | $(TAP_DRIVER) stream -n $<

## Adding dependencies of tests

Expand Down Expand Up @@ -148,4 +157,4 @@ through `test-suite.tap`:

[TAP]: https://testanything.org
[BATS]: https://github.com/sstephenson/bats
[patter]: https://github.com/apg/patter
[gotest2tap]: ../bin-go/gotest2tap/

0 comments on commit 1c3ce34

Please sign in to comment.