diff mbox series

[6/8] libstdc++: Use dg-additional-files in some non-I/O tests

Message ID 20240722163010.3508334-6-jwakely@redhat.com
State Committed
Commit 171af3580de54d482c6a32fb249e96000a9e10b8
Headers
Series [1/8] libstdc++: Clean up @diff@ markup in some I/O tests |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gcc_build--master-aarch64 success Build passed
linaro-tcwg-bot/tcwg_gcc_build--master-arm success Build passed
linaro-tcwg-bot/tcwg_gcc_check--master-aarch64 success Test passed

Commit Message

Jonathan Wakely July 22, 2024, 4:28 p.m. UTC 
  Tested x86_64-linux.

-- >8 --

libstdc++-v3/ChangeLog:

	* testsuite/20_util/hash/chi2_q_document_words.cc: Use
	dg-additional-files for input text.
	* testsuite/performance/ext/pb_ds/all_text_find.cc: Likewise.
	* testsuite/performance/ext/pb_ds/multimap_text_find.hpp:
	Likewise.
	* testsuite/performance/ext/pb_ds/multimap_text_insert.hpp:
	Likewise.
	* testsuite/performance/ext/pb_ds/multimap_text_insert_mem.hpp:
	Likewise.
	* testsuite/performance/ext/pb_ds/priority_queue_text_join.cc:
	Likewise.
	* testsuite/performance/ext/pb_ds/priority_queue_text_modify.hpp: Likewise.
	* testsuite/performance/ext/pb_ds/priority_queue_text_pop_mem.cc: Likewise.
	* testsuite/performance/ext/pb_ds/priority_queue_text_push.cc:
	Likewise.
	* testsuite/performance/ext/pb_ds/priority_queue_text_push_pop.cc: Likewise.
	* testsuite/performance/ext/pb_ds/tree_text_insert.cc: Likewise.
	* testsuite/performance/ext/pb_ds/tree_text_lor_find.cc:
	Likewise.
---
 libstdc++-v3/testsuite/20_util/hash/chi2_q_document_words.cc    | 2 ++
 libstdc++-v3/testsuite/performance/ext/pb_ds/all_text_find.cc   | 2 ++
 .../testsuite/performance/ext/pb_ds/multimap_text_find.hpp      | 2 ++
 .../testsuite/performance/ext/pb_ds/multimap_text_insert.hpp    | 2 ++
 .../performance/ext/pb_ds/multimap_text_insert_mem.hpp          | 2 ++
 .../testsuite/performance/ext/pb_ds/priority_queue_text_join.cc | 2 ++
 .../performance/ext/pb_ds/priority_queue_text_modify.hpp        | 2 ++
 .../performance/ext/pb_ds/priority_queue_text_pop_mem.cc        | 2 ++
 .../testsuite/performance/ext/pb_ds/priority_queue_text_push.cc | 2 ++
 .../performance/ext/pb_ds/priority_queue_text_push_pop.cc       | 2 ++
 .../testsuite/performance/ext/pb_ds/tree_text_insert.cc         | 2 ++
 .../testsuite/performance/ext/pb_ds/tree_text_lor_find.cc       | 2 ++
 12 files changed, 24 insertions(+)
diff mbox series

Patch

diff --git a/libstdc++-v3/testsuite/20_util/hash/chi2_q_document_words.cc b/libstdc++-v3/testsuite/20_util/hash/chi2_q_document_words.cc
index a6ebc0011eb..3c77527c27c 100644
--- a/libstdc++-v3/testsuite/20_util/hash/chi2_q_document_words.cc
+++ b/libstdc++-v3/testsuite/20_util/hash/chi2_q_document_words.cc
@@ -19,6 +19,8 @@ 
 // along with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
+// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" }
+
 #include "chi2_quality.h"
 
 // Tests chi^2 for a set of words taken from a document written in English.
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/all_text_find.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/all_text_find.cc
index 13c73a76647..df822c3d5f7 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/all_text_find.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/all_text_find.cc
@@ -29,6 +29,8 @@ 
 // purpose. It is provided "as is" without express or implied
 // warranty.
 
+// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" }
+
 /**
  * @file text_find_timing_test.cpp
  * Contains test for finding text.
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_find.hpp b/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_find.hpp
index 18e383ea17c..dbaaf04a1b6 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_find.hpp
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_find.hpp
@@ -29,6 +29,8 @@ 
 // purpose. It is provided "as is" without express or implied
 // warranty.
 
+// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" }
+
 /**
  * @file multimap_text_find_timing_test.cpp
  * Contains test for inserting text words.
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert.hpp b/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert.hpp
index 737be39a154..2c86b52f30a 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert.hpp
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert.hpp
@@ -29,6 +29,8 @@ 
 // purpose. It is provided "as is" without express or implied
 // warranty.
 
+// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" }
+
 /**
  * @file multimap_text_insert_timing_test.cpp
  * Contains test for inserting text words.
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert_mem.hpp b/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert_mem.hpp
index 9ce235381bd..ab755312c69 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert_mem.hpp
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert_mem.hpp
@@ -29,6 +29,8 @@ 
 // purpose. It is provided "as is" without express or implied
 // warranty.
 
+// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" }
+
 /**
  * @file multimap_text_insert_mem_usage_test.cpp
  * Contains test for inserting text words.
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_join.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_join.cc
index a515eea8009..aee52539fce 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_join.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_join.cc
@@ -29,6 +29,8 @@ 
 // purpose. It is provided "as is" without express or implied
 // warranty.
 
+// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" }
+
 /**
  * @file priority_queue_text_join_timing_test.cpp
  * Contains test for finding text.
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_modify.hpp b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_modify.hpp
index cb62b616105..108b67284c3 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_modify.hpp
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_modify.hpp
@@ -29,6 +29,8 @@ 
 // purpose. It is provided "as is" without express or implied
 // warranty.
 
+// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" }
+
 /**
  * @file priority_queue_text_modify_timing_test.cpp
  * Contains test for finding text.
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_pop_mem.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_pop_mem.cc
index 0a1003fe0f5..862de9858f9 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_pop_mem.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_pop_mem.cc
@@ -29,6 +29,8 @@ 
 // purpose. It is provided "as is" without express or implied
 // warranty.
 
+// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" }
+
 /**
  * @file priority_queue_text_push_pop_timing_test.cpp
  * Contains test for finding text.
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push.cc
index 5a25a9a1925..4ba1fa3174a 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push.cc
@@ -29,6 +29,8 @@ 
 // purpose. It is provided "as is" without express or implied
 // warranty.
 
+// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" }
+
 /**
  * @file priority_queue_text_push_timing_test.cpp
  * Contains test for finding text.
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push_pop.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push_pop.cc
index 4013cd28be0..0a1280962ec 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push_pop.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push_pop.cc
@@ -29,6 +29,8 @@ 
 // purpose. It is provided "as is" without express or implied
 // warranty.
 
+// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" }
+
 /**
  * @file priority_queue_text_push_pop_timing_test.cpp
  * Contains test for finding text.
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_insert.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_insert.cc
index 760006ec5ca..f439cad0c4e 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_insert.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_insert.cc
@@ -29,6 +29,8 @@ 
 // purpose. It is provided "as is" without express or implied
 // warranty.
 
+// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" }
+
 /**
  * @file tree_text_insert_timing_test.cpp
  * Contains test for finding text.
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_lor_find.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_lor_find.cc
index 53ed5538101..04dabccf74e 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_lor_find.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_lor_find.cc
@@ -29,6 +29,8 @@ 
 // purpose. It is provided "as is" without express or implied
 // warranty.
 
+// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" }
+
 /**
  * @file tree_text_lor_find_timing_test.cpp
  * Contains test for finding text with locality of reference.