Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reusing test suites #310

Merged
merged 4 commits into from
May 17, 2019
Merged

Reusing test suites #310

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e0475b4
Modify cice.setup so that test suites can use incremental compilation
phil-blain May 1, 2019
03fa23c
Update documentation
phil-blain May 1, 2019
d11c44b
Rename incremental option to buildincremental, add buildclean option
phil-blain May 13, 2019
0318f86
Update documentation
phil-blain May 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Modify cice.setup so that test suites can use incremental compilation
  • Loading branch information
@phil-blain
phil-blain committed May 1, 2019
commit e0475b401a7268df2ff2e74d3dcc200564e94e19
28 changes: 22 additions & 6 deletions cice.setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,9 +380,14 @@ else
cp -f ${ICE_SCRIPTS}/tests/timeseries.csh ${tsdir}
cp -f ${ICE_SCRIPTS}/tests/poll_queue.csh ${tsdir}

cat >! ${tsdir}/suite.run << EOF0
foreach file (${tsdir}/suite.run ${tsdir}/suite.submit)
cat >! $file << EOF0
#!/bin/csh -f

set nonomatch && rm -f ciceexe.* && unset nonomatch

EOF0
end

cat >! ${tsdir}/results.csh << EOF0
#!/bin/csh -f
Expand All @@ -403,6 +408,7 @@ echo "#------- " >> results.log
EOF0

chmod +x ${tsdir}/suite.run
chmod +x ${tsdir}/suite.submit
chmod +x ${tsdir}/results.csh

endif
Expand Down Expand Up @@ -439,7 +445,7 @@ foreach compiler ( $ncompilers )
continue
# Check if line is a sleep line, can only happen with suites
else if ( $line:q =~ 'sleep'*) then
cat >> ${tsdir}/suite.run << EOF
cat >> ${tsdir}/suite.submit << EOF
echo "-------test--------------"
echo "$line:q"
$line:q
Expand Down Expand Up @@ -829,24 +835,34 @@ EOF2

if ( ${dosuite} == 1 ) then
cd ${ICE_SANDBOX}
# Write build and run commands to suite.run
# Write build and run commands to suite.run and suite.submit

cat >> ${tsdir}/results.csh << EOF
cat ${testname_base}/test_output >> results.log
EOF

cat >> ${tsdir}/suite.run << EOF
foreach file (${tsdir}/suite.run ${tsdir}/suite.submit)
cat >> $file << EOF
echo "-------test--------------"
echo "${testname_base}"
cd ${testname_base}
source ./cice.settings
set ciceexe = "../ciceexe.\${ICE_COMPILER}.\${ICE_COMMDIR}.\${ICE_BLDDEBUG}.\${ICE_THREADED}.\${ICE_IOTYPE}"
./cice.build \${ciceexe}
if !(-e \${ciceexe}) cp -p \${ICE_RUNDIR}/cice \${ciceexe}
EOF
end
cat >> ${tsdir}/suite.submit << EOF
./cice.submit | tee -a ../suite.jobs
EOF
cat >> ${tsdir}/suite.run << EOF
./cice.test
EOF
foreach file (${tsdir}/suite.run ${tsdir}/suite.submit)
cat >> $file << EOF
cd ..

EOF
end

# Reset case for the next test in suite
set case = ${spval}
Expand Down Expand Up @@ -905,7 +921,7 @@ EOF0

# build and submit tests
cd ${tsdir}
./suite.run | tee suite.log
./suite.submit | tee suite.log
if ($report == 1) then
echo "Reporting results"
./poll_queue.csh
Expand Down
1 change: 1 addition & 0 deletions configuration/scripts/options/set_env.incremental
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
setenv ICE_CLEANBUILD false