walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

integration-tests: support out-of-tree tests 

`go test` requires both config.go and the test files in the same
directory. For out-of-tree builds, config.go is normally not placed next
to the source files, so copy the tests to the build directory as a
workaround.
This commit is contained in:
Peter Wu 2016-02-13 20:03:00 +01:00
parent a6effb4d23
commit 2593036053
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
integration-tests/Makefile.am
View File

@ -21,11 +21,14 @@
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
EXTRA_DIST = \ GO_FILES = \
nghttpx_http1_test.go \ nghttpx_http1_test.go \
nghttpx_http2_test.go \ nghttpx_http2_test.go \
nghttpx_spdy_test.go \ nghttpx_spdy_test.go \
server_tester.go \ server_tester.go
EXTRA_DIST = \
$(GO_FILES) \
server.key \ server.key \
server.crt \ server.crt \
alt-server.key \ alt-server.key \
@ -43,4 +46,5 @@ itprep-local:
go get -d -v golang.org/x/net/websocket go get -d -v golang.org/x/net/websocket
it-local: it-local:
for i in $(GO_FILES); do [ -e $(builddir)/$$i ] || cp $(srcdir)/$$i $(builddir); done
sh setenv go test -v sh setenv go test -v

1
integration-tests/config.go.in
View File

@ -2,4 +2,5 @@ package nghttp2
const ( const (
buildDir = "@top_builddir@" buildDir = "@top_builddir@"
sourceDir = "@top_srcdir@"
) )

5
integration-tests/server_tester.go
View File

@ -29,7 +29,8 @@ import (
const ( const (
serverBin = buildDir + "/src/nghttpx" serverBin = buildDir + "/src/nghttpx"
serverPort = 3009 serverPort = 3009
testDir = buildDir + "/integration-tests" testDir = sourceDir + "/integration-tests"
logDir = buildDir + "/integration-tests"
) )
func pair(name, value string) hpack.HeaderField { func pair(name, value string) hpack.HeaderField {
@ -124,7 +125,7 @@ func newServerTesterInternal(args []string, t *testing.T, handler http.Handler,
// "127.0.0.1,8080" // "127.0.0.1,8080"
b := "-b" + strings.Replace(backendURL.Host, ":", ",", -1) b := "-b" + strings.Replace(backendURL.Host, ":", ",", -1)
args = append(args, fmt.Sprintf("-f127.0.0.1,%v", serverPort), b, args = append(args, fmt.Sprintf("-f127.0.0.1,%v", serverPort), b,
"--errorlog-file="+testDir+"/log.txt", "-LINFO") "--errorlog-file="+logDir+"/log.txt", "-LINFO")
authority := fmt.Sprintf("127.0.0.1:%v", serverPort) authority := fmt.Sprintf("127.0.0.1:%v", serverPort)