Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix go-fuzz failing at Go tip, plus get testing passing again #323

Merged
merged 23 commits into from
Jun 2, 2021
Merged

fix go-fuzz failing at Go tip, plus get testing passing again #323

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
1fcfec1
travis: see if tip is now passing after #44487 fix
thepudds May 28, 2021
c69b54d
testscripts: '-h' no longer causes non-zero status code as of Go 1.15…
thepudds May 28, 2021
24ac928
testscripts: explicitly add go-fuzz-dep
thepudds May 31, 2021
56cc651
travis: comment on SET_GO111MODULE and re-order OS/versions
thepudds May 31, 2021
4a116fb
testscripts: explicitly add go-fuzz-dep
thepudds May 31, 2021
1371517
testscripts: explicitly add go-fuzz-dep
thepudds May 31, 2021
49220ec
testscripts: explicitly add go-fuzz-dep
thepudds May 31, 2021
c9b06cc
testscripts: explicitly add go-fuzz-dep
thepudds May 31, 2021
90779b0
testscripts: add explicit require for go-fuzz-dep
thepudds May 31, 2021
a554b3e
testscripts: require latest version of /go-fuzz-dep
thepudds May 31, 2021
c028abf
testscripts: require the go-fuzz module (not a package ;-)
thepudds May 31, 2021
1a4bb7e
testscripts: add go-fuzz-dep after cleaning up
thepudds May 31, 2021
55e534f
testscripts: cmd/go requires a valid go.sum entry, so use 'go get' ra…
thepudds May 31, 2021
dfa12a0
go-fuzz-build: handle abi_amd64.h, new in go1.17
thepudds May 31, 2021
21f73e4
go-fuzz-build: create workdir/.../runtime/cgo if it does not exist
thepudds May 31, 2021
2d92054
travis: use 'git clone' for go-fuzz-corpus, not 'go get'
thepudds May 31, 2021
7e31160
travis: temp workaround for 'multiple //go:build comments' error by s…
thepudds May 31, 2021
e12b030
travis: set 'go' directive for png test to go 1.15
thepudds May 31, 2021
57b1a82
travis: set 'go' directive for png test module to go 1.16
thepudds May 31, 2021
4f117ee
travis: set go 1.13 in png test mod
thepudds May 31, 2021
11ced32
go-fuzz-build: do not doubly preserve '//go:build' comments
thepudds May 31, 2021
04d125c
travis: remove temporary workaround of setting go version directive.
thepudds May 31, 2021
695f66c
travis: make sure we clone dvyukov/go-fuzz-corpus
thepudds Jun 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ script:
- testscript -v testscripts/mod_vendor.txt

# Prepare to test the png example from dvyukov/go-fuzz-corpus.
- go get -v -d github.com/dvyukov/go-fuzz-corpus/png
- git clone --depth=1 https://github.com/thepudds/go-fuzz-corpus $GOPATH/src/github.com/dvyukov/go-fuzz-corpus
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we clone the different repo (thepudds) into go-fuzz-corpus?
Do we need some fix in go-fuzz-corpus as well?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Dmitry 👋 thanks for the review!

Do we need some fix in go-fuzz-corpus as well?

The go-fuzz README likely needs to be updated regarding how to use go-fuzz-corpus (#317), and/or go-fuzz-corpus could become one or more modules, including to avoid #317 (comment). That was also the root cause of one of the ~5 reasons this testing was failing. I was taking an initial stab at a PR for go-fuzz-corpus, as well as using a go version directive in a go-fuzz-corpus go.mod as a potential workaround for the double '//go:build' issue (#313).

That said, I then switched gears to working around the go-fuzz-corpus module issues within travis (by creating a local test module in the travis script), including to keep this PR more self-contained.

In any event, I should switch the travis git clone back to dvyukov/go-fuzz-corpus, and that was my intent for this PR. Sorry for missing that.

- cd $GOPATH/src/github.com/dvyukov/go-fuzz-corpus/
- cd png
- ls -l
Expand Down