From d842678a2c371cbf59d0cd1de89aa6d64d7643c3 Mon Sep 17 00:00:00 2001 From: Fedor Korotkiy Date: Thu, 13 Feb 2020 03:07:21 +0300 Subject: [PATCH] Fix --- testenv.docker | 2 +- tools/testtool/commands/test_submission.go | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/testenv.docker b/testenv.docker index 522914c..3a486bc 100644 --- a/testenv.docker +++ b/testenv.docker @@ -6,4 +6,4 @@ COPY .gitlab-ci.yml /opt/shad/.grader-ci.yml RUN cd /opt/shad && go install gitlab.com/slon/shad-go/tools/testtool/cmd/testtool -RUN find /opt/shad | xargs chmod o-rwx +RUN find /opt/shad -type f -iname '*.go' -not -path '*/testdata/*' | xargs chmod o-rwx diff --git a/tools/testtool/commands/test_submission.go b/tools/testtool/commands/test_submission.go index 56c6fe2..f3c1cab 100644 --- a/tools/testtool/commands/test_submission.go +++ b/tools/testtool/commands/test_submission.go @@ -232,10 +232,6 @@ func runTests(testDir, problem string) error { for testPkg, testBinary := range testBinaries { relPath := strings.TrimPrefix(testPkg, moduleImportPath) - ls := exec.Command("ls", "-lah", binCache) - ls.Stdout = os.Stdout - _ = ls.Run() - cmd := exec.Command(testBinary) if currentUserIsRoot() { if err := sandbox(cmd); err != nil { @@ -248,10 +244,6 @@ func runTests(testDir, problem string) error { cmd.Stdout = os.Stdout cmd.Stderr = os.Stderr - ls = exec.Command("ls", "-lah", cmd.Dir) - ls.Stdout = os.Stdout - _ = ls.Run() - if err := cmd.Run(); err != nil { return &TestFailedError{E: err} }