Skip to content

Fixed errors in simulation tests #12235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fixed errors in simulation tests #12235

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d15b45
Fixed errors in simulation tests
MarkSh1 Jul 11, 2025
bc939f2
fixed fdbserver.exe location
MarkSh1 Aug 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/AddFdbTest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ function(add_fdb_test)
-b ${PROJECT_BINARY_DIR}
-t ${test_type}
-O ${OLD_FDBSERVER_BINARY}
--config "@CTEST_CONFIGURATION_TYPE@"
--config "${CMAKE_BUILD_TYPE}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems on windows, fdbserver.exe is placed under:

   if(WIN32)
      set(fdbserver_location ${CMAKE_BINARY_DIR}/bin/@CTEST_CONFIGURATION_TYPE@/fdbserver.exe)

I guess that should be changed as well. Since we don't test on windows, no need for doing that now.

Copy link
Contributor Author

@MarkSh1 MarkSh1 Aug 4, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed and rebased with main

--crash
--aggregate-traces ${TEST_AGGREGATE_TRACES}
--log-format ${TEST_LOG_FORMAT}
Expand Down
2 changes: 1 addition & 1 deletion tests/BGServerCommonUnit.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ startDelay = 0
[[test.workload]]
testName = 'UnitTests'
maxTestCases = 0
testsMatching = /blobgranule/server/common/
testsMatching = '/blobgranule/server/common/'
2 changes: 1 addition & 1 deletion tests/BlobManagerUnit.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ startDelay = 0
[[test.workload]]
testName = 'UnitTests'
maxTestCases = 0
testsMatching = /blobmanager/
testsMatching = '/blobmanager/'
3 changes: 2 additions & 1 deletion tests/restarting/from_7.1.0_until_7.2.0/DrUpgradeRestart-1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
storageEngineExcludeTypes=3
extraDB=3
extraDatabaseMode=Local
allowDefaultTenant = false

testTitle=DrUpgrade
clearAfterTest=false
Expand Down
2 changes: 1 addition & 1 deletion tests/restarting/from_7.2.0_until_7.3.0/ConfigureStorageMigrationTestRestart-1.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[configuration]
extraMachineCountDC = 2
disableEncryption = true
encryptModes = ['disabled']

[[test]]
testTitle = 'CloggedConfigureDatabaseTest'
Expand Down
2 changes: 1 addition & 1 deletion tests/restarting/from_7.2.0_until_7.3.0/ConfigureTestRestart-1.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[configuration]
disableEncryption=true
encryptModes = ['disabled']

[[test]]
testTitle='CloggedConfigureDatabaseTest'
Expand Down
2 changes: 1 addition & 1 deletion tests/restarting/from_7.2.0_until_7.3.0/DrUpgradeRestart-1.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[configuration]
extraDatabaseMode = "Local"
disableEncryption = true
encryptModes = ['disabled']
# In 7.2, DR is not supported in required tenant mode
allowDefaultTenant = false

Expand Down
2 changes: 1 addition & 1 deletion tests/restarting/from_7.2.4_until_7.3.0/UpgradeAndBackupRestore-1.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[configuration]
storageEngineExcludeTypes = [3]
disableEncryption = true
encryptModes = ['disabled']

[[test]]
testTitle = 'SubmitBackup'
Expand Down