From 72c29f5540bdfea12432db5898dd507baaa7a98d Mon Sep 17 00:00:00 2001 From: Norbert Oster Date: Tue, 16 Nov 2021 12:27:58 +0100 Subject: [PATCH] Hide test case and cleanroom files for stage-0 --- test.sh | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/test.sh b/test.sh index 5dc998b1..32bdcbca 100755 --- a/test.sh +++ b/test.sh @@ -237,20 +237,6 @@ function testIt { cp ${studentsource} "${testdir}"/ || die "failed" popd > /dev/null - info "- copy cleanroom sources" - mkdir cleanroom || die "failed" - pushd ../cleanroom > /dev/null || die "failed" - cp ${studentsource} "${testdir}"/cleanroom || die "failed" - popd > /dev/null - - info "- copy test sources" - pushd ../junit > /dev/null || die "failed" - cp ${testclass}.java "${testdir}"/ || die "failed" - if [ "x$secretclass" != "x" ]; then - cp ${secretclass}.java "${testdir}"/ || die "failed" - fi - popd > /dev/null - if [ "x${interfaces}" != "x" ]; then info "- copy interfaces" if [ -r ../interfaces ]; then @@ -267,6 +253,20 @@ function testIt { ( make compile-stage0 ) > comp0 2>&1 checkexit $? "\nstudent result: ☠\n" comp0 + info "- copy cleanroom sources" + mkdir cleanroom || die "failed" + pushd ../cleanroom > /dev/null || die "failed" + cp ${studentsource} "${testdir}"/cleanroom || die "failed" + popd > /dev/null + + info "- copy test sources" + pushd ../junit > /dev/null || die "failed" + cp ${testclass}.java "${testdir}"/ || die "failed" + if [ "x$secretclass" != "x" ]; then + cp ${secretclass}.java "${testdir}"/ || die "failed" + fi + popd > /dev/null + info "\nstage1 (with public test case)" info "- compiling" ( make compile-stage1 ) > comp1.out 2> comp1.err