Merge pull request #8035 from heyitsanthony/fix-e2e-cov-sig

test, osutil: disable setting SIG_DFL on linux if built with cov tag
This commit is contained in:
Anthony Romano 2017-06-05 22:48:50 -07:00 committed by GitHub
commit 8fbf7ce744
3 changed files with 3 additions and 3 deletions

View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
// +build !linux
// +build !linux cov
package osutil

View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
// +build linux
// +build linux,!cov
package osutil

2
test
View File

@ -377,7 +377,7 @@ function dep_pass {
function build_cov_pass {
out="bin"
if [ -n "${BINDIR}" ]; then out="${BINDIR}"; fi
go test -c -covermode=set -coverpkg=$PKGS_COMMA -o ${out}/etcd_test
go test -tags cov -c -covermode=set -coverpkg=$PKGS_COMMA -o ${out}/etcd_test
go test -tags cov -c -covermode=set -coverpkg=$PKGS_COMMA -o ${out}/etcdctl_test ${REPO_PATH}/etcdctl
}