cybercyst/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-05-20 06:43:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

src: split nacltest.bash into naclmake.bash and keep nacltest.bash

Browse Source 
Needed by the build system to shard tests. nacl was the last unsharded
builder.

(I considered also adding a -make-only flag to nacltest.bash, but that
wouldn't fail fast when the file didn't exist.)

Updates #15242

Change-Id: I6afc1c1fe4268ab98c0724b5764c67d3784caebe
Reviewed-on: https://go-review.googlesource.com/21851
Reviewed-by: Andrew Gerrand <adg@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Brad Fitzpatrick 2016-04-12 00:09:05 +00:00
parent 73a0185ad3
commit e569b10eba
2 changed files with 52 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/naclmake.bash Executable file
View File

@ -0,0 +1,48 @@
#!/bin/bash
# Copyright 2016 The Go Authors. All rights reserved.
# Use of this source code is governed by a BSD-style
# license that can be found in the LICENSE file.
# naclmake.bash builds runs make.bash for nacl, but not does run any
# tests. This is used by the continuous build.
# Assumes that sel_ldr binaries and go_nacl_$GOARCH_exec scripts are in $PATH;
# see ../misc/nacl/README.
set -e
ulimit -c 0
# guess GOARCH if not set
naclGOARCH=$GOARCH
if [ -z "$naclGOARCH" ]; then
case "$(uname -m)" in
x86_64)
naclGOARCH=amd64p32
;;
armv7l) # NativeClient on ARM only supports ARMv7A.
naclGOARCH=arm
;;
i?86)
naclGOARCH=386
;;
esac
fi
unset GOOS GOARCH
if [ ! -f make.bash ]; then
echo 'nacltest.bash must be run from $GOROOT/src' 1>&2
exit 1
fi
# the builder might have set GOROOT_FINAL.
export GOROOT=$(pwd)/..
# Build zip file embedded in package syscall.
echo "##### Building fake file system zip for nacl"
rm -f syscall/fstest_nacl.go
GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP:-$HOME/go1.4}
gobin=$GOROOT_BOOTSTRAP/bin
GOROOT=$GOROOT_BOOTSTRAP $gobin/go run ../misc/nacl/mkzip.go -p syscall -r .. ../misc/nacl/testzip.proto syscall/fstest_nacl.go
# Run standard build and tests.
GOOS=nacl GOARCH=$naclGOARCH ./make.bash

38
src/nacltest.bash
View File

@ -13,21 +13,7 @@
set -e
ulimit -c 0
# guess GOARCH if not set
naclGOARCH=$GOARCH
if [ -z "$naclGOARCH" ]; then
case "$(uname -m)" in
x86_64)
naclGOARCH=amd64p32
;;
armv7l) # NativeClient on ARM only supports ARMv7A.
naclGOARCH=arm
;;
i?86)
naclGOARCH=386
;;
esac
fi
. ./naclmake.bash
# Check GOARCH.
case "$naclGOARCH" in
@ -59,24 +45,8 @@ if ! which go_nacl_${naclGOARCH}_exec >/dev/null; then
exit 1
fi
unset GOOS GOARCH
if [ ! -f make.bash ]; then
echo 'nacltest.bash must be run from $GOROOT/src' 1>&2
exit 1
fi
# the builder might have set GOROOT_FINAL.
export GOROOT=$(pwd)/..
# Build zip file embedded in package syscall.
echo "##### Building fake file system zip for nacl"
rm -f syscall/fstest_nacl.go
GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP:-$HOME/go1.4}
gobin=$GOROOT_BOOTSTRAP/bin
GOROOT=$GOROOT_BOOTSTRAP $gobin/go run ../misc/nacl/mkzip.go -p syscall -r .. ../misc/nacl/testzip.proto syscall/fstest_nacl.go
# Run standard build and tests.
export PATH=$(pwd)/../misc/nacl:$PATH
GOOS=nacl GOARCH=$naclGOARCH ./all.bash
export PATH=$(pwd)/../bin:$(pwd)/../misc/nacl:$PATH
GOROOT=$(../bin/go env GOROOT)
GOOS=nacl GOARCH=$naclGOARCH go tool dist test --no-rebuild
rm -f syscall/fstest_nacl.go