Merge pull request #2542 from Expensify/main

Update expensify_prod branch

Author: neil-marcellini

benchmarks/main.cpp

@@ -131,6 +131,10 @@ int main(int argc, char* argv[])
         exclude.insert(args["-except"]);
     }
 
+    if (args.contains("-v") || args.contains("--verbose")) {
+        tpunit::_TestFixture::_verboseOutput = true;
+    }
+
     if (baselineRef.empty()) {
         // Normal benchmark run
         return runBenchmarks(include, exclude) ? 0 : 1;

test/clustertest/main.cpp

@@ -86,6 +86,7 @@ int main(int argc, char* argv[])
     if (args.isSet("-v")) {
         BedrockTester::VERBOSE_LOGGING = true;
         SLogLevel(LOG_DEBUG);
+        tpunit::_TestFixture::_verboseOutput = true;
     }
     if (args.isSet("-q")) {
         BedrockTester::QUIET_LOGGING = true;

test/lib/PrintEquality.h

@@ -9,6 +9,8 @@
 
 using namespace std;
 
+namespace tpunit {void tpunit_break_check_line();}
+
 template<typename T>
 ostream& operator<<(ostream& output, const list<T>& val)
 {
@@ -46,6 +48,7 @@ class PrintEquality {
     template<typename U, typename V>
     PrintEquality(const U& a, const V& b, bool isEqual)
     {
+        tpunit::tpunit_break_check_line();
         cout << a << " " << (isEqual ? "=" : "!") << "= " << b << "\n";
     }
 };

test/lib/tpunit++.cpp

@@ -7,6 +7,8 @@
 using namespace tpunit;
 
 atomic<bool> tpunit::_TestFixture::exitFlag(false);
+bool tpunit::_TestFixture::_verboseOutput = false;
+atomic<int> tpunit::_TestFixture::_shortOutputColumn(0);
 thread_local string tpunit::currentTestName;
 thread_local tpunit::_TestFixture* tpunit::currentTestPtr = nullptr;
 thread_local mutex tpunit::currentTestNameMutex;
@@ -429,7 +431,25 @@ bool tpunit::_TestFixture::tpunit_detail_fp_equal(double lhs, double rhs, unsign
            ((lhs_u.c[lsb] > rhs_u.c[lsb]) ? lhs_u.c[lsb] - rhs_u.c[lsb] : rhs_u.c[lsb] - lhs_u.c[lsb]) <= ulps;
 }
 
+namespace tpunit {
+void tpunit_break_check_line() {
+    if (!_TestFixture::_verboseOutput) {
+        if (currentTestPtr) {
+            currentTestPtr->_mutex->lock();
+        }
+        if (_TestFixture::_shortOutputColumn > 0) {
+            printf("\n");
+            _TestFixture::_shortOutputColumn = 0;
+        }
+        if (currentTestPtr) {
+            currentTestPtr->_mutex->unlock();
+        }
+    }
+}
+}
+
 void tpunit::_TestFixture::tpunit_detail_assert(_TestFixture* f, const char* _file, int _line) {
+    tpunit_break_check_line();
     lock_guard<recursive_mutex> lock(*(f->_mutex));
     printf("   assertion #%i at %s:%i\n", ++f->_stats._assertions, _file, _line);
     f->printTestBuffer();
@@ -442,6 +462,7 @@ void tpunit::_TestFixture::tpunit_detail_exception(_TestFixture* f, method* _met
 }
 
 void tpunit::_TestFixture::tpunit_detail_trace(_TestFixture* f, const char* _file, int _line, const char* _message) {
+    tpunit_break_check_line();
     lock_guard<recursive_mutex> lock(*(f->_mutex));
     printf("   trace #%i at %s:%i: %s\n", ++f->_stats._traces, _file, _line, _message);
     f->printTestBuffer();
@@ -455,15 +476,18 @@ void tpunit::_TestFixture::tpunit_detail_do_method(tpunit::_TestFixture::method*
        }
        (*m->_this.*m->_addr)();
     } catch(const std::exception& e) {
+       tpunit_break_check_line();
        lock_guard<recursive_mutex> lock(*(m->_this->_mutex));
        tpunit_detail_exception(m->_this, m, e.what());
     } catch(const char* e) {
+       tpunit_break_check_line();
        lock_guard<recursive_mutex> lock(*(m->_this->_mutex));
        tpunit_detail_exception(m->_this, m, e);
     } catch(ShutdownException se) {
        // Just re-throw, this exception is special and indicates that a test wants its thread to quit.
        throw;
     } catch(...) {
+       tpunit_break_check_line();
        lock_guard<recursive_mutex> lock(*(m->_this->_mutex));
        tpunit_detail_exception(m->_this, m, "caught unknown exception type");
     }
@@ -504,16 +528,34 @@ void tpunit::_TestFixture::tpunit_detail_do_tests(_TestFixture* f) {
             // No new assertions or exceptions. This not currently synchronized correctly. They can cause tests that
             // passed to appear failed when another test failed while this test was running. They cannot cause failed
             // tests to appear to have passed.
+            lock_guard<recursive_mutex> lock(m);
             if(!f->_stats._assertions && !f->_stats._exceptions) {
-                lock_guard<recursive_mutex> lock(m);
-                printf("\xE2\x9C\x85 %s %s\n", t->_name, time);
+                if (_verboseOutput) {
+                    printf("\xE2\x9C\x85 %s %s\n", t->_name, time);
+                } else {
+                    if (_shortOutputColumn >= 80) {
+                        printf("\n");
+                        _shortOutputColumn = 0;
+                    }
+                    printf("\033[32m\xE2\x9C\x93\033[0m");
+                    fflush(stdout);
+                    _shortOutputColumn++;
+                }
                 tpunit_detail_stats()._passes++;
             } else {
-                lock_guard<recursive_mutex> lock(m);
-
-                // Dump the test buffer if the test included any log lines.
-                f->printTestBuffer();
-                printf("\xE2\x9D\x8C !FAILED! \xE2\x9D\x8C %s %s\n", t->_name, time);
+                if (_verboseOutput) {
+                    // Dump the test buffer if the test included any log lines.
+                    f->printTestBuffer();
+                    printf("\xE2\x9D\x8C !FAILED! \xE2\x9D\x8C %s %s\n", t->_name, time);
+                } else {
+                    if (_shortOutputColumn > 0) {
+                        printf("\n");
+                        _shortOutputColumn = 0;
+                    }
+                    // Dump the test buffer if the test included any log lines.
+                    f->printTestBuffer();
+                    printf("\xE2\x9D\x8C !FAILED! \xE2\x9D\x8C %s %s\n\n", t->_name, time);
+                }
                 tpunit_detail_stats()._failures++;
                 tpunit_detail_stats()._failureNames.emplace(t->_name);
             }

test/lib/tpunit++.hpp

@@ -204,6 +204,8 @@ namespace tpunit {
       public:
 
          static std::atomic<bool> exitFlag;
+         static bool _verboseOutput;
+         static std::atomic<int> _shortOutputColumn;
 
          struct perFixtureStats {
             perFixtureStats();
@@ -439,6 +441,12 @@ namespace tpunit {
 
    extern thread_local tpunit::_TestFixture* currentTestPtr;
 
+   /**
+    * If short output mode is active and checks have been printed on the current
+    * line, prints a newline and resets the column counter.
+    */
+   void tpunit_break_check_line();
+
    /**
     * Convenience class containing the entry point to run all registered tests.
     */

test/main.cpp

@@ -98,6 +98,7 @@ int main(int argc, char* argv[])
     if (args.isSet("-v")) {
         BedrockTester::VERBOSE_LOGGING = true;
         SLogLevel(LOG_DEBUG);
+        tpunit::_TestFixture::_verboseOutput = true;
     }
     if (args.isSet("-q")) {
         BedrockTester::QUIET_LOGGING = true;