File tree 2 files changed +11
-25
lines changed
2 files changed +11
-25
lines changed Original file line number Diff line number Diff line change @@ -192,9 +192,6 @@ OCAMLPACKAGES_TESTS =
192
192
if HAVE_OCAML_PKG_GETTEXT
193
193
OCAMLPACKAGES += -package gettext-stub
194
194
endif
195
- if HAVE_OCAML_PKG_OUNIT
196
- OCAMLPACKAGES_TESTS += -package ounit2
197
- endif
198
195
199
196
OCAMLCLIBS = \
200
197
-pthread -lpthread \
@@ -358,17 +355,12 @@ TESTS = \
358
355
test-virt-builder-cacheall.sh \
359
356
test-virt-builder-list.sh \
360
357
test-virt-index-validate.sh \
361
- $(SLOW_TESTS )
362
- check_PROGRAMS =
363
-
364
- TESTS += \
365
358
test-virt-builder-list-simplestreams.sh \
366
- test-virt-builder.sh
367
-
368
- if HAVE_OCAML_PKG_OUNIT
369
- check_PROGRAMS += index_parser_tests
370
- TESTS += index_parser_tests
371
- endif
359
+ test-virt-builder.sh \
360
+ index_parser_tests \
361
+ $(SLOW_TESTS )
362
+ check_PROGRAMS = \
363
+ index_parser_tests
372
364
373
365
check-valgrind :
374
366
$(MAKE ) VG=" @VG@" check
Original file line number Diff line number Diff line change 1
1
(* builder
2
2
* Copyright (C) 2017 SUSE Inc.
3
+ * Copyright (C) 2025 Red Hat
3
4
*
4
5
* This program is free software; you can redistribute it and/or modify
5
6
* it under the terms of the GNU General Public License as published by
20
21
21
22
open Printf
22
23
23
- open OUnit2
24
-
25
24
open Std_utils
26
25
open Unix_utils
27
26
open Tools_utils
@@ -68,14 +67,18 @@ let format_entries entries =
68
67
read_file " out" in
69
68
List. map format_entry entries
70
69
70
+ let assert_equal ~printer a b =
71
+ if a <> b then
72
+ failwithf " FAIL: %s <> %s" (printer a) (printer b)
73
+
71
74
let assert_equal_string = assert_equal ~printer: (fun x -> sprintf " \" %s\" " x)
72
75
let assert_equal_list formatter =
73
76
let printer = (
74
77
fun x -> " (" ^ (String. escaped (String. concat " ," (formatter x))) ^ " )"
75
78
) in
76
79
assert_equal ~printer
77
80
78
- let test_write_complete ctx =
81
+ let () =
79
82
let entry =
80
83
(" test-id" , { Index. printable_name = Some " test_name" ;
81
84
osinfo = Some " osinfo_data" ;
@@ -122,12 +125,3 @@ aliases=alias1 alias2
122
125
123
126
let parsed_entries = parse_file " out" in
124
127
assert_equal_list format_entries [entry] parsed_entries
125
-
126
- let suite =
127
- " builder Index_parser" > :::
128
- [
129
- " write.complete" > :: test_write_complete;
130
- ]
131
-
132
- let () =
133
- run_test_tt_main suite
You can’t perform that action at this time.
0 commit comments