fixes #12583
Continuing on the work of @chrislennon.
I've applied his changes to the tests and also updated:
unit_test_directory(const std::string fileName)
Any guidance on further improvements or refactored would be very much welcomed
67 | @@ -68,7 +68,7 @@ TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(cha 68 | 69 | RegisterAllCoreRPCCommands(tableRPC); 70 | ClearDatadirCache(); 71 | - pathTemp = fs::temp_directory_path() / strprintf("test_bitcoin_%lu_%i", (unsigned long)GetTime(), (int)(InsecureRandRange(100000))); 72 | + fs::path pathTemp = util_tests::unit_test_directory("test_bitcoin");
This shadows pathTemp, you might as well rename it m_path_temp according to the developer guidelines
27 | + 28 | + std::string sub_dir = "bitcoin_unit_tests"; 29 | + fs::path dir(fs::temp_directory_path() / sub_dir); 30 | + fs::path test_dir(dir / fileName / std::string(boost::unit_test::framework::current_test_case().p_name)); 31 | + 32 | + if(!fs::exists(dir))
The dir will exist when the previous run was not shut down cleanly or when running two test_bitcoin at the same time. I don't think we should silently continue here.
Needs rebase
Still needs rebase
Have really made a mess of this PR, appreciate help to remedy it but understand if it would be cleaner to scrap it all together
git checkout $your_branch
git merge 0bc980b1f65f3739bb9667d58abab1137c0f942a # merge all master changes
git reset --soft 0bc980b1f65f3739bb9667d58abab1137c0f942a # consider all non-master changes to be put in a commit
git commit -m 'commit message' # Put all non-master changes in this commit
git push origin $your_branch -f # Force push the rewritten branch
Adding namespace util_tests and updating dirname using unit_test_directory
Adding header file for util_tests and exposing namespace util_tests
Adding include statement for util_tests.h and changing pathTemp to m_path_temp
Implementing util_tests function to create temp directory 'test_main'
Implementing util_tests function to create temp directory 'dbwrapper_tests'
Implementing util_tests function to create highest level temp dir 'test_bitcoin'
Refactoring pathTemp to m_path_temp
Currently stuck, would really appreciate any guidance on the following:
$ make -C src/test$ src/test/test_bitcoin and a common temp folder is created - bitcoin_unit_testsExtending these tests to qt tests when running $ make at the root folder returns an error -
util_tests::unit_test_directory(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&)", referenced from:
_main in test_bitcoin_qt-test_main.o
TestingSetup::TestingSetup(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&) in qt_test_test_bitcoin_qt-test_bitcoin.o
ld: symbol(s) not found for architecture x86_64
clang: error: linker command failed with exit code 1 (use -v to see invocation)
I've attempted to include test/utils.h in Makefile.qttest.include but that doesn't seem to be the correct solution