Merge pull request #1938 from vogel/disable-tests

Disable tests Reviewed-by: graydon
stellar · Mar 6, 2019 · b8077bf · b8077bf
2 parents 8d180be + 43bd5ec
commit b8077bf
Show file tree

Hide file tree

Showing 86 changed files with 400 additions and 340 deletions.
diff --git a/Builds/VisualStudio/stellar-core.vcxproj.filters b/Builds/VisualStudio/stellar-core.vcxproj.filters
diff --git a/common.mk b/common.mk
@@ -12,3 +12,6 @@ AM_CPPFLAGS += -isystem "$(top_srcdir)/lib"			\
 if USE_POSTGRES
 AM_CPPFLAGS += -DUSE_POSTGRES=1 $(libpq_CFLAGS)
 endif # USE_POSTGRES
+if BUILD_TESTS
+AM_CPPFLAGS += -DBUILD_TESTS=1
+endif # BUILD_TESTS
diff --git a/configure.ac b/configure.ac
@@ -277,6 +277,11 @@ if test x"$enable_postgres" != xno; then
 fi
 AM_CONDITIONAL(USE_POSTGRES, [test -n "$have_postgres"])
 
+AC_ARG_ENABLE(tests,
+    AS_HELP_STRING([--disable-tests],
+        [Disable building test suite]))
+AM_CONDITIONAL(BUILD_TESTS, [test x$enable_tests != xno])
+
 # Need this to pass through ccache for xdrpp, libsodium
 esc() {
     out=

diff --git a/make-mks b/make-mks
@@ -18,9 +18,11 @@ message="# This file was generated by make-mks; don't edit it by hand."
 # must run "git add -N foo.cpp" before running this script.
 (cd src
  echo "$message"
- echo "SRC_H_FILES" = $(git ls-files '*.h' '*.[ih]pp')
- echo "SRC_CXX_FILES" = $(git ls-files '*.cpp')
- echo "SRC_X_FILES" = $(git ls-files '*.x')
+ echo "SRC_H_FILES" = $(git ls-files '*.h' '*.[ih]pp' | tr " " "\n" | sort | uniq | egrep -v '(test|simulation)/' | tr "\n" " ")
+ echo "SRC_CXX_FILES" = $(git ls-files '*.cpp' | tr " " "\n" | sort | uniq |  egrep -v '(test|simulation)/' | tr "\n" " ")
+ echo "SRC_X_FILES" = $(git ls-files '*.x' | tr " " "\n" | sort | uniq | tr "\n" " ")
+ echo "SRC_TEST_H_FILES" = $(git ls-files '*.h' '*.[ih]pp' | tr " " "\n" | egrep '(test|simulation)/' | tr "\n" " ")
+ echo "SRC_TEST_CXX_FILES" = $(git ls-files '*.cpp' | tr " " "\n" | sort | uniq |  egrep '(test|simulation)/' | tr "\n" " ")
 ) > src/src.mk
 
 

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -8,7 +8,12 @@ include $(srcdir)/src.mk
 
 noinst_HEADERS = $(SRC_H_FILES)
 
+if BUILD_TESTS
+stellar_core_SOURCES = main/StellarCoreVersion.cpp $(SRC_CXX_FILES) $(SRC_TEST_CXX_FILES)
+else # !BUILD_TESTS
 stellar_core_SOURCES = main/StellarCoreVersion.cpp $(SRC_CXX_FILES)
+endif # !BUILD_TESTS
+
 stellar_core_LDADD = $(soci_LIBS) $(libmedida_LIBS)		\
 	$(top_builddir)/lib/lib3rdparty.a $(sqlite3_LIBS)	\
 	$(libpq_LIBS) $(xdrpp_LIBS) $(libsodium_LIBS)
@@ -54,7 +59,7 @@ endif # !USE_POSTGRES
 
 if USE_CLANG_FORMAT
 format: always
-	cd $(srcdir) && $(CLANG_FORMAT) -style=file -i $(SRC_CXX_FILES) $(SRC_H_FILES)
+	cd $(srcdir) && $(CLANG_FORMAT) -style=file -i $(SRC_CXX_FILES) $(SRC_H_FILES) $(SRC_TEST_CXX_FILES) $(SRC_TEST_H_FILES)
 endif # USE_CLANG_FORMAT
 
 if USE_AFL_FUZZ

diff --git a/src/bucket/BucketTests.cpp → src/bucket/test/BucketTests.cpp b/src/bucket/BucketTests.cpp → src/bucket/test/BucketTests.cpp
@@ -16,8 +16,8 @@
 #include "database/Database.h"
 #include "herder/LedgerCloseData.h"
 #include "ledger/LedgerManager.h"
-#include "ledger/LedgerTestUtils.h"
 #include "ledger/LedgerTxn.h"
+#include "ledger/test/LedgerTestUtils.h"
 #include "lib/catch.hpp"
 #include "main/Application.h"
 #include "medida/meter.h"

diff --git a/src/catchup/CatchupWork.cpp b/src/catchup/CatchupWork.cpp
@@ -16,7 +16,6 @@
 #include "historywork/VerifyBucketWork.h"
 #include "ledger/LedgerManager.h"
 #include "main/Application.h"
-#include "test/TestPrinter.h"
 #include "util/Logging.h"
 #include <lib/util/format.h>
 

diff --git a/src/catchup/CatchupWorkTests.cpp → src/catchup/test/CatchupWorkTests.cpp b/src/catchup/CatchupWorkTests.cpp → src/catchup/test/CatchupWorkTests.cpp
@@ -2,7 +2,7 @@
 // under the Apache License, Version 2.0. See the COPYING file at the root
 // of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
 
-#include "catchup/CatchupWorkTests.h"
+#include "catchup/test/CatchupWorkTests.h"
 #include "catchup/CatchupConfiguration.h"
 #include "catchup/CatchupWork.h"
 #include "ledger/CheckpointRange.h"

diff --git a/src/catchup/CatchupWorkTests.h → src/catchup/test/CatchupWorkTests.h b/src/catchup/CatchupWorkTests.h → src/catchup/test/CatchupWorkTests.h
diff --git a/src/crypto/CryptoTests.cpp → src/crypto/test/CryptoTests.cpp b/src/crypto/CryptoTests.cpp → src/crypto/test/CryptoTests.cpp
diff --git a/...database/DatabaseConnectionStringTest.cpp → ...ase/test/DatabaseConnectionStringTest.cpp b/...database/DatabaseConnectionStringTest.cpp → ...ase/test/DatabaseConnectionStringTest.cpp
diff --git a/src/database/DatabaseTests.cpp → src/database/test/DatabaseTests.cpp b/src/database/DatabaseTests.cpp → src/database/test/DatabaseTests.cpp
diff --git a/src/herder/HerderTests.cpp → src/herder/test/HerderTests.cpp b/src/herder/HerderTests.cpp → src/herder/test/HerderTests.cpp
diff --git a/src/herder/PendingEnvelopesTests.cpp → src/herder/test/PendingEnvelopesTests.cpp b/src/herder/PendingEnvelopesTests.cpp → src/herder/test/PendingEnvelopesTests.cpp
diff --git a/src/herder/UpgradesTests.cpp → src/herder/test/UpgradesTests.cpp b/src/herder/UpgradesTests.cpp → src/herder/test/UpgradesTests.cpp
@@ -6,7 +6,7 @@
 #include "herder/LedgerCloseData.h"
 #include "herder/Upgrades.h"
 #include "history/HistoryArchiveManager.h"
-#include "history/HistoryTestsUtils.h"
+#include "history/test/HistoryTestsUtils.h"
 #include "ledger/LedgerTxn.h"
 #include "ledger/LedgerTxnEntry.h"
 #include "ledger/LedgerTxnHeader.h"

diff --git a/src/history/HistoryTests.cpp → src/history/test/HistoryTests.cpp b/src/history/HistoryTests.cpp → src/history/test/HistoryTests.cpp
@@ -2,12 +2,12 @@
 // under the Apache License, Version 2.0. See the COPYING file at the root
 // of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
 
-#include "FileTransferInfo.h"
 #include "bucket/BucketManager.h"
-#include "catchup/CatchupWorkTests.h"
+#include "catchup/test/CatchupWorkTests.h"
+#include "history/FileTransferInfo.h"
 #include "history/HistoryArchiveManager.h"
 #include "history/HistoryManager.h"
-#include "history/HistoryTestsUtils.h"
+#include "history/test/HistoryTestsUtils.h"
 #include "historywork/GetHistoryArchiveStateWork.h"
 #include "historywork/GunzipFileWork.h"
 #include "historywork/GzipFileWork.h"

diff --git a/src/history/HistoryTestsUtils.cpp → src/history/test/HistoryTestsUtils.cpp b/src/history/HistoryTestsUtils.cpp → src/history/test/HistoryTestsUtils.cpp
@@ -2,12 +2,12 @@
 // under the Apache License, Version 2.0. See the COPYING file at the root
 // of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
 
-#include "history/HistoryTestsUtils.h"
-#include "FileTransferInfo.h"
+#include "history/test/HistoryTestsUtils.h"
 #include "bucket/BucketManager.h"
 #include "crypto/Hex.h"
 #include "crypto/Random.h"
 #include "herder/TxSetFrame.h"
+#include "history/FileTransferInfo.h"
 #include "history/HistoryArchiveManager.h"
 #include "ledger/CheckpointRange.h"
 #include "ledger/LedgerRange.h"

diff --git a/src/history/HistoryTestsUtils.h → src/history/test/HistoryTestsUtils.h b/src/history/HistoryTestsUtils.h → src/history/test/HistoryTestsUtils.h
@@ -4,17 +4,17 @@
 // under the Apache License, Version 2.0. See the COPYING file at the root
 // of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
 
-#include "FileTransferInfo.h"
 #include "bucket/BucketList.h"
 #include "catchup/VerifyLedgerChainWork.h"
 #include "crypto/Hex.h"
 #include "herder/LedgerCloseData.h"
+#include "history/FileTransferInfo.h"
 #include "history/HistoryArchive.h"
 #include "historywork/GzipFileWork.h"
 #include "historywork/MakeRemoteDirWork.h"
 #include "historywork/PutRemoteFileWork.h"
 #include "ledger/LedgerRange.h"
-#include "ledger/LedgerTestUtils.h"
+#include "ledger/test/LedgerTestUtils.h"
 #include "main/Application.h"
 #include "main/Config.h"
 #include "util/Timer.h"

diff --git a/src/history/InferredQuorumTests.cpp → src/history/test/InferredQuorumTests.cpp b/src/history/InferredQuorumTests.cpp → src/history/test/InferredQuorumTests.cpp
diff --git a/src/history/SerializeTests.cpp → src/history/test/SerializeTests.cpp b/src/history/SerializeTests.cpp → src/history/test/SerializeTests.cpp
diff --git a/...nt/AccountSubEntriesCountIsValidTests.cpp → ...st/AccountSubEntriesCountIsValidTests.cpp b/...nt/AccountSubEntriesCountIsValidTests.cpp → ...st/AccountSubEntriesCountIsValidTests.cpp
@@ -6,9 +6,9 @@
 #include "invariant/AccountSubEntriesCountIsValid.h"
 #include "invariant/InvariantDoesNotHold.h"
 #include "invariant/InvariantManager.h"
-#include "invariant/InvariantTestUtils.h"
-#include "ledger/LedgerTestUtils.h"
+#include "invariant/test/InvariantTestUtils.h"
 #include "ledger/LedgerTxn.h"
+#include "ledger/test/LedgerTestUtils.h"
 #include "lib/catch.hpp"
 #include "main/Application.h"
 #include "test/TestUtils.h"

diff --git a/...cketListIsConsistentWithDatabaseTests.cpp → ...cketListIsConsistentWithDatabaseTests.cpp b/...cketListIsConsistentWithDatabaseTests.cpp → ...cketListIsConsistentWithDatabaseTests.cpp
@@ -7,10 +7,10 @@
 #include "bucket/BucketOutputIterator.h"
 #include "catchup/ApplyBucketsWork.h"
 #include "ledger/LedgerHashUtils.h"
-#include "ledger/LedgerTestUtils.h"
 #include "ledger/LedgerTxn.h"
 #include "ledger/LedgerTxnEntry.h"
 #include "ledger/LedgerTxnHeader.h"
+#include "ledger/test/LedgerTestUtils.h"
 #include "lib/catch.hpp"
 #include "main/Application.h"
 #include "test/TestUtils.h"

diff --git a/src/invariant/ConservationOfLumensTests.cpp → ...ariant/test/ConservationOfLumensTests.cpp b/src/invariant/ConservationOfLumensTests.cpp → ...ariant/test/ConservationOfLumensTests.cpp
@@ -5,7 +5,7 @@
 #include "invariant/ConservationOfLumens.h"
 #include "invariant/InvariantDoesNotHold.h"
 #include "invariant/InvariantManager.h"
-#include "invariant/InvariantTestUtils.h"
+#include "invariant/test/InvariantTestUtils.h"
 #include "ledger/LedgerTxn.h"
 #include "ledger/LedgerTxnHeader.h"
 #include "lib/catch.hpp"

diff --git a/src/invariant/InvariantTestUtils.cpp → src/invariant/test/InvariantTestUtils.cpp b/src/invariant/InvariantTestUtils.cpp → src/invariant/test/InvariantTestUtils.cpp
@@ -2,13 +2,13 @@
 // under the Apache License, Version 2.0. See the COPYING file at the root
 // of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
 
-#include "invariant/InvariantTestUtils.h"
+#include "invariant/test/InvariantTestUtils.h"
 #include "invariant/InvariantDoesNotHold.h"
 #include "invariant/InvariantManager.h"
 #include "ledger/LedgerManager.h"
-#include "ledger/LedgerTestUtils.h"
 #include "ledger/LedgerTxn.h"
 #include "ledger/LedgerTxnEntry.h"
+#include "ledger/test/LedgerTestUtils.h"
 #include "lib/catch.hpp"
 #include "main/Application.h"
 #include "transactions/TransactionUtils.h"

diff --git a/src/invariant/InvariantTestUtils.h → src/invariant/test/InvariantTestUtils.h b/src/invariant/InvariantTestUtils.h → src/invariant/test/InvariantTestUtils.h
diff --git a/src/invariant/InvariantTests.cpp → src/invariant/test/InvariantTests.cpp b/src/invariant/InvariantTests.cpp → src/invariant/test/InvariantTests.cpp
@@ -10,8 +10,8 @@
 #include "invariant/Invariant.h"
 #include "invariant/InvariantDoesNotHold.h"
 #include "invariant/InvariantManager.h"
-#include "ledger/LedgerTestUtils.h"
 #include "ledger/LedgerTxn.h"
+#include "ledger/test/LedgerTestUtils.h"
 #include "lib/catch.hpp"
 #include "main/Application.h"
 #include "test/TestUtils.h"

diff --git a/...invariant/LiabilitiesMatchOffersTests.cpp → ...iant/test/LiabilitiesMatchOffersTests.cpp b/...invariant/LiabilitiesMatchOffersTests.cpp → ...iant/test/LiabilitiesMatchOffersTests.cpp
@@ -4,11 +4,11 @@
 
 #include "invariant/InvariantDoesNotHold.h"
 #include "invariant/InvariantManager.h"
-#include "invariant/InvariantTestUtils.h"
 #include "invariant/LiabilitiesMatchOffers.h"
-#include "ledger/LedgerTestUtils.h"
+#include "invariant/test/InvariantTestUtils.h"
 #include "ledger/LedgerTxn.h"
 #include "ledger/LedgerTxnHeader.h"
+#include "ledger/test/LedgerTestUtils.h"
 #include "lib/catch.hpp"
 #include "main/Application.h"
 #include "test/TestUtils.h"

diff --git a/src/ledger/LedgerHeaderTests.cpp → src/ledger/test/LedgerHeaderTests.cpp b/src/ledger/LedgerHeaderTests.cpp → src/ledger/test/LedgerHeaderTests.cpp
diff --git a/src/ledger/LedgerManagerTests.cpp → src/ledger/test/LedgerManagerTests.cpp b/src/ledger/LedgerManagerTests.cpp → src/ledger/test/LedgerManagerTests.cpp
diff --git a/src/ledger/LedgerTestUtils.cpp → src/ledger/test/LedgerTestUtils.cpp b/src/ledger/LedgerTestUtils.cpp → src/ledger/test/LedgerTestUtils.cpp
diff --git a/src/ledger/LedgerTestUtils.h → src/ledger/test/LedgerTestUtils.h b/src/ledger/LedgerTestUtils.h → src/ledger/test/LedgerTestUtils.h
diff --git a/src/ledger/LedgerTests.cpp → src/ledger/test/LedgerTests.cpp b/src/ledger/LedgerTests.cpp → src/ledger/test/LedgerTests.cpp
diff --git a/src/ledger/LedgerTxnTests.cpp → src/ledger/test/LedgerTxnTests.cpp b/src/ledger/LedgerTxnTests.cpp → src/ledger/test/LedgerTxnTests.cpp
@@ -2,10 +2,10 @@
 // under the Apache License, Version 2.0. See the COPYING file at the root
 // of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
 
-#include "ledger/LedgerTestUtils.h"
 #include "ledger/LedgerTxn.h"
 #include "ledger/LedgerTxnEntry.h"
 #include "ledger/LedgerTxnHeader.h"
+#include "ledger/test/LedgerTestUtils.h"
 #include "lib/catch.hpp"
 #include "main/Application.h"
 #include "test/TestUtils.h"

diff --git a/src/ledger/LiabilitiesTests.cpp → src/ledger/test/LiabilitiesTests.cpp b/src/ledger/LiabilitiesTests.cpp → src/ledger/test/LiabilitiesTests.cpp
@@ -2,10 +2,10 @@
 // under the Apache License, Version 2.0. See the COPYING file at the root
 // of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
 
-#include "ledger/LedgerTestUtils.h"
 #include "ledger/LedgerTxn.h"
 #include "ledger/LedgerTxnEntry.h"
 #include "ledger/LedgerTxnHeader.h"
+#include "ledger/test/LedgerTestUtils.h"
 #include "lib/catch.hpp"
 #include "main/Application.h"
 #include "test/TestUtils.h"

diff --git a/src/ledger/SyncingLedgerChainTests.cpp → src/ledger/test/SyncingLedgerChainTests.cpp b/src/ledger/SyncingLedgerChainTests.cpp → src/ledger/test/SyncingLedgerChainTests.cpp
diff --git a/src/main/Application.h b/src/main/Application.h
@@ -36,13 +36,16 @@ class InvariantManager;
 class OverlayManager;
 class Database;
 class PersistentState;
-class LoadGenerator;
 class CommandHandler;
 class WorkManager;
 class BanManager;
 class StatusManager;
 class LedgerTxnRoot;
 
+#ifdef BUILD_TESTS
+class LoadGenerator;
+#endif
+
 class Application;
 void validateNetworkPassphrase(std::shared_ptr<Application> app);
 
@@ -241,6 +244,7 @@ class Application
     // true. Otherwise return false. This method exists only for testing.
     virtual bool manualClose() = 0;
 
+#ifdef BUILD_TESTS
     // If config.ARTIFICIALLY_GENERATE_LOAD_FOR_TESTING=true, generate some load
     // against the current application.
     virtual void generateLoad(bool isCreate, uint32_t nAccounts,
@@ -249,6 +253,7 @@ class Application
 
     // Access the load generator for manual operation.
     virtual LoadGenerator& getLoadGenerator() = 0;
+#endif
 
     // Execute any administrative commands written in the Config.COMMANDS
     // variable of the config file. This permits scripting certain actions to

diff --git a/src/main/ApplicationImpl.cpp b/src/main/ApplicationImpl.cpp
@@ -40,17 +40,20 @@
 #include "process/ProcessManager.h"
 #include "scp/LocalNode.h"
 #include "scp/QuorumSetUtils.h"
-#include "simulation/LoadGenerator.h"
 #include "util/GlobalChecks.h"
 #include "util/LogSlowExecution.h"
+#include "util/Logging.h"
 #include "util/StatusManager.h"
+#include "util/TmpDir.h"
 #include "work/WorkManager.h"
 
-#include "util/Logging.h"
-#include "util/TmpDir.h"
+#ifdef BUILD_TESTS
+#include "simulation/LoadGenerator.h"
+#endif
 
 #include <set>
 #include <string>
+#include <util/format.h>
 
 static const int SHUTDOWN_DELAY_SECONDS = 1;
 
@@ -466,6 +469,7 @@ ApplicationImpl::manualClose()
     return false;
 }
 
+#ifdef BUILD_TESTS
 void
 ApplicationImpl::generateLoad(bool isCreate, uint32_t nAccounts,
                               uint32_t offset, uint32_t nTxs, uint32_t txRate,
@@ -485,6 +489,7 @@ ApplicationImpl::getLoadGenerator()
     }
     return *mLoadGenerator;
 }
+#endif
 
 void
 ApplicationImpl::applyCfgCommands()

diff --git a/src/main/ApplicationImpl.h b/src/main/ApplicationImpl.h
@@ -29,7 +29,6 @@ class HistoryManager;
 class ProcessManager;
 class CommandHandler;
 class Database;
-class LoadGenerator;
 class LedgerTxnRoot;
 
 class ApplicationImpl : public Application
@@ -96,11 +95,13 @@ class ApplicationImpl : public Application
 
     virtual bool manualClose() override;
 
+#ifdef BUILD_TESTS
     virtual void generateLoad(bool isCreate, uint32_t nAccounts,
                               uint32_t offset, uint32_t nTxs, uint32_t txRate,
                               uint32_t batchSize, bool autoRate) override;
 
     virtual LoadGenerator& getLoadGenerator() override;
+#endif
 
     virtual void applyCfgCommands() override;
 
@@ -150,11 +151,14 @@ class ApplicationImpl : public Application
     std::unique_ptr<CommandHandler> mCommandHandler;
     std::shared_ptr<WorkManager> mWorkManager;
     std::unique_ptr<PersistentState> mPersistentState;
-    std::unique_ptr<LoadGenerator> mLoadGenerator;
     std::unique_ptr<BanManager> mBanManager;
     std::unique_ptr<StatusManager> mStatusManager;
     std::unique_ptr<LedgerTxnRoot> mLedgerTxnRoot;
 
+#ifdef BUILD_TESTS
+    std::unique_ptr<LoadGenerator> mLoadGenerator;
+#endif
+
     std::vector<std::thread> mWorkerThreads;
 
     asio::signal_set mStopSignals;