configure: reverting change I need to talk with Ricky about ..

danpovey · danpovey · commit 5bb57a9cff3f · 2014-08-15T04:44:01.000Z
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@4312 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
diff --git a/src/configure b/src/configure
@@ -327,7 +327,7 @@ function fix_cxx_flag {
   CXXCOMPILER=`grep "CXX = " kaldi.mk | awk '{print $3}'`
   if [ $CXXCOMPILER=="g++" ]; then
     $CXXCOMPILER -dumpversion | \
-    awk '{if(NR==1 && $$1<"4.8") print "sed \"s/-Wno-unused-local-typedefs/-Wall/g\" \
+    awk '{if(NR==1 && $1<"4.4") print "sed \"s/-Wno-unused-local-typedefs//g\" \
     kaldi.mk > tmpf; mv tmpf kaldi.mk; "}' | sh -
   fi
 }
diff --git a/src/thread/kaldi-thread-test.cc b/src/thread/kaldi-thread-test.cc
@@ -21,6 +21,7 @@
 
 #include "base/kaldi-common.h"
 #include "thread/kaldi-thread.h"
+#include "thread/kaldi-mutex.h"
 
 namespace kaldi {
 
@@ -80,11 +81,29 @@ void TestThreads() {
   }
 }
 
+void TestMutex() {
+  for (int32 i = 0; i < 4; i++) {
+    Mutex mut;
+    for (int32 i = 0; i < 100; i++) {
+      if (rand() % 2 == 0) {
+        mut.Lock();
+        KALDI_ASSERT(!mut.TryLock());
+        mut.Unlock();
+      } else {
+        KALDI_ASSERT(mut.TryLock());
+        mut.Unlock();
+      }
+    }
+  }
+}
+
+
 
 }  // end namespace kaldi.
 
 int main() {
   using namespace kaldi;
   TestThreads();
+  TestMutex();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,7 @@ function fix_cxx_flag {`
`327`	`327`	CXXCOMPILER=`grep "CXX = " kaldi.mk \| awk '{print $3}'`
`328`	`328`	`if [ $CXXCOMPILER=="g++" ]; then`
`329`	`329`	`$CXXCOMPILER -dumpversion \| \`
`330`		`- awk '{if(NR==1 && $$1<"4.8") print "sed \"s/-Wno-unused-local-typedefs/-Wall/g\" \`
	`330`	`+ awk '{if(NR==1 && $1<"4.4") print "sed \"s/-Wno-unused-local-typedefs//g\" \`
`331`	`331`	`kaldi.mk > tmpf; mv tmpf kaldi.mk; "}' \| sh -`
`332`	`332`	`fi`
`333`	`333`	`}`