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

Fixes some issues with the testing script #39

Merged
merged 1 commit into from
Jun 25, 2019
Merged

Fixes some issues with the testing script #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 15 additions & 3 deletions full_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ fi
# shouldn't be tested (e.g. we exclude the base configs and some specialized
# tests)
echo "Running regular tests" | tee -a $LOGNAME
BULK_EXCLUDE="(br-base|fedora-base|incremental|clean|timeout-build|timeout-run)"
BULK_EXCLUDE="(br-base|fedora-base|incremental|clean|timeout-build|timeout-run|bare|dummy-bare|spike-jobs|spike)"
./marshal clean test/!$BULK_EXCLUDE.json | tee -a $LOGNAME
./marshal test test/!$BULK_EXCLUDE.json | tee -a $LOGNAME
if [ ${PIPESTATUS[0]} != 0 ]; then
Expand All @@ -50,12 +50,24 @@ else
echo "Success" | tee -a $LOGNAME
fi

# These tests need to run on spike, but not with the initramfs option
echo "Running bare-metal tests" | tee -a $LOGNAME
IS_INCLUDE="@(bare|dummy-bare|spike|spike-jobs)"
./marshal clean test/$IS_INCLUDE.json | tee -a $LOGNAME
# This is a temporary workaround for bug #38
./marshal build test/spike.json
./marshal test -s test/$IS_INCLUDE.json | tee -a $LOGNAME
if [ ${PIPESTATUS[0]} != 0 ]; then
echo "Failure" | tee -a $LOGNAME
SUITE_PASS=false
else
echo "Success" | tee -a $LOGNAME
fi

# Run the initramfs versions on spike, initramfs runs have many restrictions,
# we only run a few tests here to test basic capabilities
echo "Running initramfs capable tests on spike" | tee -a $LOGNAME
IS_INCLUDE="@(command|flist|host-init|jobs|linux-src|overlay|post-run-hook|run|smoke0)"
# ls test/$IS_INCLUDE.json
# exit 0
./marshal -i clean test/$IS_INCLUDE.json | tee -a $LOGNAME
./marshal -i test -s test/$IS_INCLUDE.json | tee -a $LOGNAME
if [ ${PIPESTATUS[0]} != 0 ]; then
Expand Down
6 changes: 3 additions & 3 deletions marshal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ def main():

if args.command == 'test':
suitePass = True


skipCount = 0
failCount = 0
for cfgPath in args.config_files:
# Each config gets it's own logging output and results directory
wlutil.setRunName(cfgPath, args.command)
Expand Down Expand Up @@ -114,8 +116,6 @@ def main():
log.exception("Failed to launch workload:")

elif args.command == "test":
skipCount = 0
failCount = 0
log.info("Running: " + cfgPath)
res = wlutil.testWorkload(cfgPath, cfgs, args.verbose, spike=args.spike, cmp_only=args.manual)
if res is wlutil.testResult.failure:
Expand Down