qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-25 10:27:57 -07:00
Code Releases Activity

gotest: allow make test of cgo packages (without make install)

Browse Source 
R=r
CC=golang-dev, stevvooe
https://golang.org/cl/1995051
This commit is contained in:
Russ Cox 2010-08-25 18:00:42 -04:00
parent 15f336b675
commit 423e410258
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Make.pkg
View File

@ -138,12 +138,16 @@ _CGO_LDFLAGS_darwin=-dynamiclib -Wl,-undefined,dynamic_lookup
_cgo_defun.$O: _cgo_defun.c _cgo_defun.$O: _cgo_defun.c
$(CC) $(CFLAGS) $(RUNTIME_CFLAGS) _cgo_defun.c $(CC) $(CFLAGS) $(RUNTIME_CFLAGS) _cgo_defun.c
_cgo_.so: $(GCC_OFILES) $(CGO_DEPS) $(CGOTARG).so: $(GCC_OFILES) $(CGO_DEPS)
$(HOST_CC) $(_CGO_CFLAGS_$(GOARCH)) -o $@ $(GCC_OFILES) $(CGO_LDFLAGS) $(_CGO_LDFLAGS_$(GOOS)) $(HOST_CC) $(_CGO_CFLAGS_$(GOARCH)) -o $@ $(GCC_OFILES) $(CGO_LDFLAGS) $(_CGO_LDFLAGS_$(GOOS))
$(pkgdir)/$(CGOTARG).so: _cgo_.so $(pkgdir)/$(CGOTARG).so: $(CGOTARG).so
@test -d $(QUOTED_GOROOT)/pkg && mkdir -p $(pkgdir)/$(dir) @test -d $(QUOTED_GOROOT)/pkg && mkdir -p $(pkgdir)
cp _cgo_.so "$@" cp $(CGOTARG).so "$@"
ifneq ($(CGOFILES),)
testpackage: $(CGOTARG).so
endif
# Generic build rules. # Generic build rules.
# These come last so that the rules above can override them # These come last so that the rules above can override them

6
src/cmd/gotest/gotest
View File

@ -174,4 +174,10 @@ importpath=$(gomake -s importpath)
$GC _testmain.go $GC _testmain.go
$GL _testmain.$O $GL _testmain.$O
# Set dynamic linker library path, no matter what it's called,
# to include the current directory while running $O.out,
# so that cgo libraries can be tested without installation.
LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH \
DYLD_LIBRARY_PATH=.:$DYLD_LIBRARY_PATH \
$E ./$O.out "$@" $E ./$O.out "$@"