diff options
| -rw-r--r-- | .github/workflows/ci.yml | 4 | ||||
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | dashboard/app/util_test.go | 2 | ||||
| -rw-r--r-- | pkg/cover/report_test.go | 4 | ||||
| -rw-r--r-- | tools/docker/README.md | 5 | ||||
| -rw-r--r-- | tools/docker/env/Dockerfile | 2 | ||||
| l--------- | tools/syz-big-env | 1 | ||||
| -rwxr-xr-x | tools/syz-env | 4 |
8 files changed, 12 insertions, 16 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 59f7dd711..e296a1286 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,7 +69,7 @@ jobs: path: .cache key: cache - name: run - run: gopath/src/github.com/google/syzkaller/.github/workflows/run.sh syz-big-env timeout --signal=SIGINT 15m make presubmit_big + run: gopath/src/github.com/google/syzkaller/.github/workflows/run.sh syz-env timeout --signal=SIGINT 15m make presubmit_big - name: codecov uses: codecov/codecov-action@2a829b95deaeea2d11d127cc0358005714ff35ea # v3 with: @@ -91,7 +91,7 @@ jobs: path: .cache key: cache - name: run - run: gopath/src/github.com/google/syzkaller/.github/workflows/run.sh syz-big-env make ${{ matrix.target }} + run: gopath/src/github.com/google/syzkaller/.github/workflows/run.sh syz-env make ${{ matrix.target }} race: runs-on: self-hosted steps: @@ -365,10 +365,10 @@ presubmit_arch_executor: descriptions env TARGETOS=test TARGETARCH=32_fork_shmem $(MAKE) executor presubmit_big: descriptions - # This target runs on CI in syz-big-env, - # so we test packages that need GCloud SDK or OS toolchains. + # This target runs on CI in syz-env, + # so we can test packages that need GCloud SDK or OS toolchains. # Run tests with clang on Linux. - # big-env also contains toolchains for NetBSD/Fuchsia/Akaros, + # syz-env also contains toolchains for NetBSD/Fuchsia/Akaros, # but these OSes use fixed toolchains and are not affected by SYZ_CLANG=yes. # This way we get maximum coverage: smoke run tests Linux/gcc, # while this run tests Linux/clang + the additional OSes. diff --git a/dashboard/app/util_test.go b/dashboard/app/util_test.go index 54b63e949..ca61a0a54 100644 --- a/dashboard/app/util_test.go +++ b/dashboard/app/util_test.go @@ -49,7 +49,7 @@ type Ctx struct { var skipDevAppserverTests = func() bool { _, err := exec.LookPath("dev_appserver.py") // Don't silently skip tests on CI, we should have gcloud sdk installed there. - return err != nil && os.Getenv("SYZ_BIG_ENV") == "" + return err != nil && os.Getenv("SYZ_ENV") == "" }() func NewCtx(t *testing.T) *Ctx { diff --git a/pkg/cover/report_test.go b/pkg/cover/report_test.go index 72f5c0665..64baf3ee2 100644 --- a/pkg/cover/report_test.go +++ b/pkg/cover/report_test.go @@ -220,7 +220,7 @@ func buildTestBinary(t *testing.T, target *targets.Target, test Test, dir string errText = strings.ReplaceAll(errText, "‘", "'") errText = strings.ReplaceAll(errText, "’", "'") if strings.Contains(errText, "error: unrecognized command line option '-fsanitize-coverage=trace-pc'") && - (os.Getenv("SYZ_BIG_ENV") == "" || target.OS == targets.Akaros) { + (os.Getenv("SYZ_ENV") == "" || target.OS == targets.Akaros) { t.Skip("skipping test, -fsanitize-coverage=trace-pc is not supported") } t.Fatal(err) @@ -248,7 +248,7 @@ func buildTestBinary(t *testing.T, target *targets.Target, test Test, dir string ldflags = ldflags[:len(ldflags)-1] } if _, err := osutil.RunCmd(time.Hour, "", target.CCompiler, ldflags...); err != nil { - // Arm linker in the big-env image has a bug when linking a clang-produced files. + // Arm linker in the env image has a bug when linking a clang-produced files. if regexp.MustCompile(`arm-linux-gnueabi.* assertion fail`).MatchString(err.Error()) { t.Skipf("skipping test, broken arm linker (%v)", err) } diff --git a/tools/docker/README.md b/tools/docker/README.md index e52af1c69..384ce326a 100644 --- a/tools/docker/README.md +++ b/tools/docker/README.md @@ -3,11 +3,10 @@ We provide a set of Docker images that provide dev environment suitable for syzkaller development/testing. These images are used by CI, but can also be used for [local development](/docs/contributing.md#using-syz-env). -- [env](/tools/docker/env/Dockerfile) includes Go toolchain, C/C++ cross-compilers, make, git and other essential tools. -- [big-env](/tools/docker/big-env/Dockerfile) includes akaros/fuchsia/netbsd toolchains and gcloud sdk on top of `env` image. +- [env](/tools/docker/env/Dockerfile) includes Go/fuchsia/netbsd toolchains, gcloud sdk, C/C++ cross-compilers, make, git and other essential tools. - [old-env](/tools/docker/old-env/Dockerfile) provides essential tools but based on an older disto (ubuntu:16.04). -These images are available as `gcr.io/syzkaller/{env,big-env,old-env}`, respectively. +These images are available as `gcr.io/syzkaller/{env,old-env}`, respectively. To download and run locally: ``` diff --git a/tools/docker/env/Dockerfile b/tools/docker/env/Dockerfile index 2317f8848..d7855c382 100644 --- a/tools/docker/env/Dockerfile +++ b/tools/docker/env/Dockerfile @@ -67,7 +67,7 @@ RUN sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/b # ./build.sh -j72 -m amd64 -U -T ../tools -D ../dest distribution # # To build root image run: -# docker run -it --rm --privileged --device /dev/loop0 gcr.io/syzkaller/big-env +# docker run -it --rm --privileged --device /dev/loop0 gcr.io/syzkaller/env # mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc # create-image.sh -a s390x -d buster diff --git a/tools/syz-big-env b/tools/syz-big-env deleted file mode 120000 index f0d710eb1..000000000 --- a/tools/syz-big-env +++ /dev/null @@ -1 +0,0 @@ -syz-env
\ No newline at end of file diff --git a/tools/syz-env b/tools/syz-env index d41ca1726..296122f58 100755 --- a/tools/syz-env +++ b/tools/syz-env @@ -48,9 +48,7 @@ fi SCRIPT_DIR="$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)" IMAGE="env" -if [ "$(basename -- "$0")" == "syz-big-env" ]; then - IMAGE="big-env" -elif [ "$(basename -- "$0")" == "syz-old-env" ]; then +if [ "$(basename -- "$0")" == "syz-old-env" ]; then IMAGE="old-env" fi |