Skip to content
This repository has been archived by the owner on Mar 21, 2024. It is now read-only.

Commit

Permalink
Thrust: Testing, Eris - Copy the FileCheck data into a subdirectory o…
Browse files Browse the repository at this point in the history 
…f the main testsuite install directory so that thrust_nightly.pl doesn't try to run the filecheck data.

bug 2017697
bug 2025046

Jobs: 2017697-2006 2025046-2006
[git-p4: depot-paths = "//sw/gpgpu/thrust/": change = 23209549]
  • Loading branch information
@brycelelbach
brycelelbach committed May 29, 2018
1 parent 525d6d9 commit 527e492
Show file tree
Hide file tree
Showing 12 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion thrust_tests.trs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"tests" : [

{
"exe" : "thrust_nightly.pl -bin-path=${TR_TESTSUITE_DIR} -filecheck-data-path=${TR_TESTSUITE_DIR} -filecheck-path=${TR_INSTALL_DIR}/cuda/_internal/compiler/nvvm/tools"
"exe" : "thrust_nightly.pl -bin-path=${TR_TESTSUITE_DIR} -filecheck-data-path=${TR_TESTSUITE_DIR}/filecheck_data -filecheck-path=${TR_INSTALL_DIR}/cuda/_internal/compiler/nvvm/tools"
}

]
Expand Down
2 changes: 1 addition & 1 deletion thrust_tests.vlcc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"artifacts" : [
{ "${THRUST_TESTS_BIN_DIR}/*" : "cuda/_tests/thrust_tests/." },
{ "internal/test/thrust_nightly.pl" : "cuda/_tests/thrust_tests/." },
{ "internal/test/*.filecheck" : "cuda/_tests/thrust_tests/." },
{ "internal/test/*.filecheck" : "cuda/_tests/thrust_tests/filecheck_data/." },
{ "thrust_tests.vlct" : "cuda/_tests/thrust_tests/.", "kind" : "TESTSUITE" }
],
# Dependencies for this component.
Expand Down
2 changes: 1 addition & 1 deletion thrust_tests.vlct
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"tests" : [

{
"exe" : "thrust_nightly.pl -bin-path=${VULCAN_TESTSUITE_DIR} -filecheck-data-path=${VULCAN_TESTSUITE_DIR} -filecheck-path=${VULCAN_INSTALL_DIR}/cuda/_internal/compiler/nvvm/tools"
"exe" : "thrust_nightly.pl -bin-path=${VULCAN_TESTSUITE_DIR} -filecheck-data-path=${VULCAN_TESTSUITE_DIR}/filecheck_data -filecheck-path=${VULCAN_INSTALL_DIR}/cuda/_internal/compiler/nvvm/tools"
}

]
Expand Down
2 changes: 1 addition & 1 deletion thrust_tests_L0.trs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"tests" : [

{
"exe" : "thrust_nightly.pl -bin-path=${TR_TESTSUITE_DIR} -filecheck-data-path=${TR_TESTSUITE_DIR} -filecheck-path=${TR_INSTALL_DIR}/cuda/_internal/compiler/nvvm/tools"
"exe" : "thrust_nightly.pl -bin-path=${TR_TESTSUITE_DIR} -filecheck-data-path=${TR_TESTSUITE_DIR}/filecheck_data -filecheck-path=${TR_INSTALL_DIR}/cuda/_internal/compiler/nvvm/tools"
}

]
Expand Down
2 changes: 1 addition & 1 deletion thrust_tests_L0.vlcc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"artifacts" : [
{ "${THRUST_TESTS_BIN_DIR}/*" : "cuda/_tests/thrust_tests_L0/." },
{ "internal/test/thrust_nightly.pl" : "cuda/_tests/thrust_tests_L0/." },
{ "internal/test/*.filecheck" : "cuda/_tests/thrust_tests_L0/." },
{ "internal/test/*.filecheck" : "cuda/_tests/thrust_tests_L0/filecheck_data/." },
{ "thrust_tests_L0.vlct" : "cuda/_tests/thrust_tests_L0/.", "kind" : "TESTSUITE" }
],
# Dependencies for this component.
Expand Down
2 changes: 1 addition & 1 deletion thrust_tests_L0.vlct
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"tests" : [

{
"exe" : "thrust_nightly.pl -bin-path=${VULCAN_TESTSUITE_DIR} -filecheck-data-path=${VULCAN_TESTSUITE_DIR} -filecheck-path=${VULCAN_INSTALL_DIR}/cuda/_internal/compiler/nvvm/tools"
"exe" : "thrust_nightly.pl -bin-path=${VULCAN_TESTSUITE_DIR} -filecheck-data-path=${VULCAN_TESTSUITE_DIR}/filecheck_data -filecheck-path=${VULCAN_INSTALL_DIR}/cuda/_internal/compiler/nvvm/tools"
}

]
Expand Down
2 changes: 1 addition & 1 deletion thrust_tests_L1.trs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"tests" : [

{
"exe" : "thrust_nightly.pl -bin-path=${TR_TESTSUITE_DIR} -filecheck-data-path=${TR_TESTSUITE_DIR} -filecheck-path=${TR_INSTALL_DIR}/cuda/_internal/compiler/nvvm/tools"
"exe" : "thrust_nightly.pl -bin-path=${TR_TESTSUITE_DIR} -filecheck-data-path=${TR_TESTSUITE_DIR}/filecheck_data -filecheck-path=${TR_INSTALL_DIR}/cuda/_internal/compiler/nvvm/tools"
}

]
Expand Down
2 changes: 1 addition & 1 deletion thrust_tests_L1.vlcc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"artifacts" : [
{ "${THRUST_TESTS_BIN_DIR}/*" : "cuda/_tests/thrust_tests_L1/." },
{ "internal/test/thrust_nightly.pl" : "cuda/_tests/thrust_tests_L1/." },
{ "internal/test/*.filecheck" : "cuda/_tests/thrust_tests_L1/." },
{ "internal/test/*.filecheck" : "cuda/_tests/thrust_tests_L1/filecheck_data/." },
{ "thrust_tests_L1.vlct" : "cuda/_tests/thrust_tests_L1/.", "kind" : "TESTSUITE" }
],
# Dependencies for this component.
Expand Down
2 changes: 1 addition & 1 deletion thrust_tests_L1.vlct
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"tests" : [

{
"exe" : "thrust_nightly.pl -bin-path=${VULCAN_TESTSUITE_DIR} -filecheck-data-path=${VULCAN_TESTSUITE_DIR} -filecheck-path=${VULCAN_INSTALL_DIR}/cuda/_internal/compiler/nvvm/tools"
"exe" : "thrust_nightly.pl -bin-path=${VULCAN_TESTSUITE_DIR} -filecheck-data-path=${VULCAN_TESTSUITE_DIR}/filecheck_data -filecheck-path=${VULCAN_INSTALL_DIR}/cuda/_internal/compiler/nvvm/tools"
}

]
Expand Down
2 changes: 1 addition & 1 deletion thrust_tests_L2.trs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"tests" : [

{
"exe" : "thrust_nightly.pl -bin-path=${TR_TESTSUITE_DIR} -filecheck-data-path=${TR_TESTSUITE_DIR} -filecheck-path=${TR_INSTALL_DIR}/cuda/_internal/compiler/nvvm/tools"
"exe" : "thrust_nightly.pl -bin-path=${TR_TESTSUITE_DIR} -filecheck-data-path=${TR_TESTSUITE_DIR}/filecheck_data -filecheck-path=${TR_INSTALL_DIR}/cuda/_internal/compiler/nvvm/tools"
}

]
Expand Down
2 changes: 1 addition & 1 deletion thrust_tests_L2.vlcc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"artifacts" : [
{ "${THRUST_TESTS_BIN_DIR}/*" : "cuda/_tests/thrust_tests_L2/." },
{ "internal/test/thrust_nightly.pl" : "cuda/_tests/thrust_tests_L2/." },
{ "internal/test/*.filecheck" : "cuda/_tests/thrust_tests_L2/." },
{ "internal/test/*.filecheck" : "cuda/_tests/thrust_tests_L2/filecheck_data/." },
{ "thrust_tests_L2.vlct" : "cuda/_tests/thrust_tests_L2/.", "kind" : "TESTSUITE" }
],
# Dependencies for this component.
Expand Down
2 changes: 1 addition & 1 deletion thrust_tests_L2.vlct
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"tests" : [

{
"exe" : "thrust_nightly.pl -bin-path=${VULCAN_TESTSUITE_DIR} -filecheck-data-path=${VULCAN_TESTSUITE_DIR} -filecheck-path=${VULCAN_INSTALL_DIR}/cuda/_internal/compiler/nvvm/tools"
"exe" : "thrust_nightly.pl -bin-path=${VULCAN_TESTSUITE_DIR} -filecheck-data-path=${VULCAN_TESTSUITE_DIR}/filecheck_data -filecheck-path=${VULCAN_INSTALL_DIR}/cuda/_internal/compiler/nvvm/tools"
}

]
Expand Down

0 comments on commit 527e492

Please sign in to comment.