Skip to content

Revert "Try enabling using cmake for LNT automation testing. (#315)" #316

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

Merged
merged 1 commit into from
Jun 2, 2017
Merged

Revert "Try enabling using cmake for LNT automation testing. (#315)" #316

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
Revert "Try enabling using cmake for LNT automation testing. (#315)" 
This reverts commit eefccde.
  • Loading branch information
@dtarditi
dtarditi committed Jun 2, 2017
commit c25d759145de14d976575e99e452eeb2d24fe346
29 changes: 14 additions & 15 deletions automation/UNIX/test-lnt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,21 @@ if [ ! -e "$CLANG" ]; then
exit 1
fi

# "$LNT_SCRIPT" runtest nt --sandbox "$LNT_RESULTS_DIR" --no-timestamp \
# --cc "$CLANG" --test-suite ${BUILD_SOURCESDIRECTORY}/llvm-test-suite \
"$LNT_SCRIPT" runtest nt --sandbox "$LNT_RESULTS_DIR" --no-timestamp \
--cc "$CLANG" --test-suite ${BUILD_SOURCESDIRECTORY}/llvm-test-suite \
--cflags -fcheckedc-extension \
--make-param=ExtraHeaders=${BUILD_SOURCESDIRECTORY}/llvm/projects/checkedc-wrapper/checkedc/include \
-v --output=${RESULT_DATA} -j${BUILD_CPU_COUNT} | tee ${RESULT_SUMMARY}

# Code for running tests using cmake. Needs further testing before enabling.
#
# "$LNT_SCRIPT" runtest test-suite --sandbox "$LNT_RESULTS_DIR" --no-timestamp \
# --cc "$CLANG" --test-suite ${BUILD_SOURCESDIRECTORY}/llvm-test-suite \
# --cflags -fcheckedc-extension \
# --make-param=ExtraHeaders=${BUILD_SOURCESDIRECTORY}/llvm/projects/checkedc-wrapper/checkedc/include \
# -v --output=${RESULT_DATA} -j${BUILD_CPU_COUNT} | tee ${RESULT_SUMMARY}

# Code for running tests using cmake.

"$LNT_SCRIPT" runtest test-suite --sandbox "$LNT_RESULTS_DIR" --no-timestamp \
--cc "$CLANG" --test-suite ${BUILD_SOURCESDIRECTORY}/llvm-test-suite \
--cflags -fcheckedc-extension \
--use-cmake=/usr/local/bin/cmake \
--cmake-cache ${BUILDCONFIGURATION} \
--use-lit=${BUILD_SOURCESDIRECTORY}/llvm/utils/lit/lit.py \
--cmake-define "CHECKEDC_SPEC_DIR=${BUILD_SOURCESDIRECTORY}/llvm/projects/checkedc-wrapper/checkedc" \
-v | tee ${RESULT_SUMMARY}
# --use-cmake=/usr/local/bin/cmake \
# --cmake-cache ${BUILDCONFIGURATION} \
# --use-lit=${BUILD_SOURCESDIRECTORY}/llvm/utilkkvs/lit/lit.py \
# -v | tee ${RESULT_SUMMARY}

if grep FAIL ${RESULT_SUMMARY}; then
echo "LNT testing failed."
Expand Down