From 38b5077013d71c75e8f706b6191a3c88180bc58f Mon Sep 17 00:00:00 2001
From: Chris Fairles <chris.fairles@gmail.com>
Date: Sat, 13 Sep 2008 09:38:05 +0000
Subject: [PATCH] 1.cc: Join thread before program exits.

2008-09-13  Chris Fairles  <chris.fairles@gmail.com>

        * testsuite/30_threads/thread/algorithm/1.cc: Join thread before
        program exits.
        * testsuite/30_threads/thread/algorithm/2.cc: Likewise.
        * testsuite/30_threads/thread/this_thread/3.cc: Define test variable.
        * testsuite/30_threads/thread/this_thread/4.cc: Likewise.


Co-Authored-By: Benjamin Kosnik <bkoz@redhat.com>

From-SVN: r140338
---
 libstdc++-v3/ChangeLog                         | 10 +++++++++-
 .../testsuite/30_threads/thread/algorithm/1.cc | 18 ++++++++++--------
 .../testsuite/30_threads/thread/algorithm/2.cc |  6 ++++++
 .../30_threads/thread/this_thread/3.cc         |  2 ++
 .../30_threads/thread/this_thread/4.cc         |  2 ++
 5 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 249eba7a9315..bd89e6e1346c 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,4 +1,12 @@
-2008-09-12  Chris Fairles <chris.fairles@gmail.com>
+2008-09-13  Chris Fairles  <chris.fairles@gmail.com>
+
+        * testsuite/30_threads/thread/algorithm/1.cc: Join thread before
+        program exits.
+        * testsuite/30_threads/thread/algorithm/2.cc: Likewise.
+        * testsuite/30_threads/thread/this_thread/3.cc: Define test variable.
+        * testsuite/30_threads/thread/this_thread/4.cc: Likewise.
+
+2008-09-12  Chris Fairles  <chris.fairles@gmail.com>
 	    Benjamin Kosnik  <bkoz@redhat.com>
 
 	* include/std/thread: New.
diff --git a/libstdc++-v3/testsuite/30_threads/thread/algorithm/1.cc b/libstdc++-v3/testsuite/30_threads/thread/algorithm/1.cc
index 950ffb38bfe5..e70bbbbe6128 100644
--- a/libstdc++-v3/testsuite/30_threads/thread/algorithm/1.cc
+++ b/libstdc++-v3/testsuite/30_threads/thread/algorithm/1.cc
@@ -45,14 +45,16 @@ int main()
 
   try 
     {
-	std::thread t1(f);
-	std::thread::id t1_id = t1.get_id();
-	
-	std::thread t2;
-	t2.swap(std::move(t1));
-	
-	VERIFY( t1.get_id() == std::thread::id() );
-	VERIFY( t2.get_id() == t1_id ); 
+      std::thread t1(f);
+      std::thread::id t1_id = t1.get_id();
+      
+      std::thread t2;
+      t2.swap(std::move(t1));
+      
+      VERIFY( t1.get_id() == std::thread::id() );
+      VERIFY( t2.get_id() == t1_id );
+      
+      t2.join();
     }
   catch (const std::system_error&)
     {
diff --git a/libstdc++-v3/testsuite/30_threads/thread/algorithm/2.cc b/libstdc++-v3/testsuite/30_threads/thread/algorithm/2.cc
index f587aac0cb40..5dfce5366c8b 100644
--- a/libstdc++-v3/testsuite/30_threads/thread/algorithm/2.cc
+++ b/libstdc++-v3/testsuite/30_threads/thread/algorithm/2.cc
@@ -51,6 +51,8 @@ void test01()
       
       VERIFY( t1.get_id() == std::thread::id() );
       VERIFY( t2.get_id() == t1_id );
+
+      t2.join();
     }
  catch (const std::system_error&)
    {
@@ -73,6 +75,8 @@ void test02()
       std::swap(std::move(t1), t2);
 
       VERIFY( t2.get_id() == t1_id );
+
+      t2.join();
     }
   catch (const std::system_error&)
     {
@@ -95,6 +99,8 @@ void test03()
       std::swap(t2, std::move(t1));
 
       VERIFY( t2.get_id() == t1_id );
+      
+      t2.join();
     }
   catch (const std::system_error&)
     {
diff --git a/libstdc++-v3/testsuite/30_threads/thread/this_thread/3.cc b/libstdc++-v3/testsuite/30_threads/thread/this_thread/3.cc
index 335e41057fb1..564bd1f704e6 100644
--- a/libstdc++-v3/testsuite/30_threads/thread/this_thread/3.cc
+++ b/libstdc++-v3/testsuite/30_threads/thread/this_thread/3.cc
@@ -42,6 +42,8 @@ namespace chr = std::chrono;
 
 void foo()
 {
+  bool test __attribute__((unused)) = true;
+
   chr::system_clock::time_point begin = chr::system_clock::now();
   chr::microseconds ms(500);
 
diff --git a/libstdc++-v3/testsuite/30_threads/thread/this_thread/4.cc b/libstdc++-v3/testsuite/30_threads/thread/this_thread/4.cc
index 3612779142f4..54bef5bae31a 100644
--- a/libstdc++-v3/testsuite/30_threads/thread/this_thread/4.cc
+++ b/libstdc++-v3/testsuite/30_threads/thread/this_thread/4.cc
@@ -42,6 +42,8 @@ namespace chr = std::chrono;
 
 void foo()
 {
+  bool test __attribute__((unused)) = true;
+
   chr::system_clock::time_point begin = chr::system_clock::now();
   chr::microseconds ms(500);