Skip to content

Commit 8b729ab

Browse files
Merge branch '35-remove-valgrind'
2 parents 47c6b2e + 80203cf commit 8b729ab

File tree

7 files changed

+2
-100
lines changed

7 files changed

+2
-100
lines changed

.github/workflows/dart.yml

-22
Original file line numberDiff line numberDiff line change
@@ -72,28 +72,6 @@ jobs:
7272
../tool/pub.sh run build_runner build
7373
../tool/pub.sh run test
7474
75-
# Temporarily disabled, see internal issue.
76-
# valgrind:
77-
# runs-on: ubuntu-22.04
78-
# steps:
79-
# - uses: actions/checkout@v3
80-
# - uses: dart-lang/setup-dart@v1
81-
# with:
82-
# sdk: 2.19.2
83-
# - name: Install ObjectBox C-API
84-
# run: ./install.sh
85-
# - name: Install Valgrind
86-
# run: ./tool/apt-install.sh valgrind
87-
# - name: Test
88-
# working-directory: objectbox_test
89-
# # Run shorter tests, if available (to prevent timeouts in CI).
90-
# env:
91-
# TEST_SHORT: 1
92-
# run: |
93-
# dart pub get
94-
# dart run build_runner build
95-
# ./tool/valgrind.sh
96-
9775
flutter-integration-test:
9876
strategy:
9977
fail-fast: false

objectbox_test/Makefile

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Default target executed when no arguments are given to make.
22
default: help
33

4-
.PHONY: default help depend test valgrind-test
4+
.PHONY: default help depend test
55

66
help: ## Show this help
77
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
@@ -15,7 +15,3 @@ depend: ## Build dependencies
1515
test: ## Generate code and run unit tests
1616
dart run build_runner build
1717
dart run test
18-
19-
valgrind-test: ## Test all targets with valgrind
20-
dart run build_runner build
21-
./tool/valgrind.sh

objectbox_test/test/query_property_test.dart

-8
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,6 @@ void main() {
6262

6363
final tString = TestEntity_.tString;
6464

65-
test('property query auto-close', () {
66-
// Finalizer is executed after the query object goes out of scope.
67-
// Note: only caught by valgrind - I've tested that it actually catches
68-
// when the finalizer assignment was disabled. Now, this will only fail in
69-
// CI when running valgrind.sh - if finalizer won't work properly.
70-
box.query().build().property(TestEntity_.tString).find();
71-
});
72-
7365
test('.count (basic query)', () {
7466
box.putMany(integerList());
7567
box.putMany(stringList());

objectbox_test/test/query_test.dart

-8
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,6 @@ void main() {
1919
});
2020
tearDown(() => env.closeAndDelete());
2121

22-
test('Query auto-close', () {
23-
// Finalizer is executed after the query object goes out of scope.
24-
// Note: only caught by valgrind - I've tested that it actually catches
25-
// when the finalizer assignment was disabled. Now, this will only fail in
26-
// CI when running valgrind.sh - if finalizer won't work properly.
27-
box.query().build().find();
28-
});
29-
3022
test('Query with no conditions, and order as desc ints', () async {
3123
box.putMany(<TestEntity>[
3224
TestEntity(tInt: 0),

objectbox_test/test/test_env.dart

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ class TestEnv {
1212
/// If environment variable TEST_SHORT=1 is set, this will be true.
1313
///
1414
/// If true, try to run tests quicker, e.g. with less objects or iterations.
15-
/// This is currently only used to speed up valgrind analysis and avoid CI
16-
/// timeouts.
15+
/// This was used to speed up valgrind analysis and avoid CI timeouts.
1716
final bool short;
1817

1918
factory TestEnv(String name, {bool? queryCaseSensitive, int? debugFlag}) {

objectbox_test/tool/common.sh

-10
This file was deleted.

objectbox_test/tool/valgrind.sh

-45
This file was deleted.

0 commit comments

Comments
 (0)