Skip to content

Commit 169a32b

Browse files
mwiniarsmairacanal
mwiniars
authored and
mairacanal
committed
drm/cmdline-parser: Use assert when needed
Expecting to observe a specific value, when the function responsible for setting the value has failed will lead to extra noise in test output. Use assert when the situation calls for it. Also - very small tidying up around the changed areas (whitespace). v2: Leave out the locals (drm_connector is huge) (lkp) Signed-off-by: Michał Winiarski <[email protected]> Reviewed-by: Maíra Canal <[email protected]> Signed-off-by: Maíra Canal <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 0af02a0 commit 169a32b

File tree

1 file changed

+40
-40
lines changed

1 file changed

+40
-40
lines changed

‎drivers/gpu/drm/tests/drm_cmdline_parser_test.c

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ static void drm_cmdline_test_force_e_only(struct kunit *test)
1616
struct drm_cmdline_mode mode = { };
1717
const char *cmdline = "e";
1818

19-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
19+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
2020
&no_connector, &mode));
2121
KUNIT_EXPECT_FALSE(test, mode.specified);
2222
KUNIT_EXPECT_FALSE(test, mode.refresh_specified);
@@ -34,7 +34,7 @@ static void drm_cmdline_test_force_D_only_not_digital(struct kunit *test)
3434
struct drm_cmdline_mode mode = { };
3535
const char *cmdline = "D";
3636

37-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
37+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
3838
&no_connector, &mode));
3939
KUNIT_EXPECT_FALSE(test, mode.specified);
4040
KUNIT_EXPECT_FALSE(test, mode.refresh_specified);
@@ -56,7 +56,7 @@ static void drm_cmdline_test_force_D_only_hdmi(struct kunit *test)
5656
struct drm_cmdline_mode mode = { };
5757
const char *cmdline = "D";
5858

59-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
59+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
6060
&connector_hdmi, &mode));
6161
KUNIT_EXPECT_FALSE(test, mode.specified);
6262
KUNIT_EXPECT_FALSE(test, mode.refresh_specified);
@@ -78,7 +78,7 @@ static void drm_cmdline_test_force_D_only_dvi(struct kunit *test)
7878
struct drm_cmdline_mode mode = { };
7979
const char *cmdline = "D";
8080

81-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
81+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
8282
&connector_dvi, &mode));
8383
KUNIT_EXPECT_FALSE(test, mode.specified);
8484
KUNIT_EXPECT_FALSE(test, mode.refresh_specified);
@@ -96,7 +96,7 @@ static void drm_cmdline_test_force_d_only(struct kunit *test)
9696
struct drm_cmdline_mode mode = { };
9797
const char *cmdline = "d";
9898

99-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
99+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
100100
&no_connector, &mode));
101101
KUNIT_EXPECT_FALSE(test, mode.specified);
102102
KUNIT_EXPECT_FALSE(test, mode.refresh_specified);
@@ -114,7 +114,7 @@ static void drm_cmdline_test_res(struct kunit *test)
114114
struct drm_cmdline_mode mode = { };
115115
const char *cmdline = "720x480";
116116

117-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
117+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
118118
&no_connector, &mode));
119119
KUNIT_EXPECT_TRUE(test, mode.specified);
120120
KUNIT_EXPECT_EQ(test, mode.xres, 720);
@@ -136,7 +136,7 @@ static void drm_cmdline_test_res_vesa(struct kunit *test)
136136
struct drm_cmdline_mode mode = { };
137137
const char *cmdline = "720x480M";
138138

139-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
139+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
140140
&no_connector, &mode));
141141
KUNIT_EXPECT_TRUE(test, mode.specified);
142142
KUNIT_EXPECT_EQ(test, mode.xres, 720);
@@ -158,7 +158,7 @@ static void drm_cmdline_test_res_vesa_rblank(struct kunit *test)
158158
struct drm_cmdline_mode mode = { };
159159
const char *cmdline = "720x480MR";
160160

161-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
161+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
162162
&no_connector, &mode));
163163
KUNIT_EXPECT_TRUE(test, mode.specified);
164164
KUNIT_EXPECT_EQ(test, mode.xres, 720);
@@ -180,7 +180,7 @@ static void drm_cmdline_test_res_rblank(struct kunit *test)
180180
struct drm_cmdline_mode mode = { };
181181
const char *cmdline = "720x480R";
182182

183-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
183+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
184184
&no_connector, &mode));
185185
KUNIT_EXPECT_TRUE(test, mode.specified);
186186
KUNIT_EXPECT_EQ(test, mode.xres, 720);
@@ -202,7 +202,7 @@ static void drm_cmdline_test_res_bpp(struct kunit *test)
202202
struct drm_cmdline_mode mode = { };
203203
const char *cmdline = "720x480-24";
204204

205-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
205+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
206206
&no_connector, &mode));
207207
KUNIT_EXPECT_TRUE(test, mode.specified);
208208
KUNIT_EXPECT_EQ(test, mode.xres, 720);
@@ -225,7 +225,7 @@ static void drm_cmdline_test_res_refresh(struct kunit *test)
225225
struct drm_cmdline_mode mode = { };
226226
const char *cmdline = "720x480@60";
227227

228-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
228+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
229229
&no_connector, &mode));
230230
KUNIT_EXPECT_TRUE(test, mode.specified);
231231
KUNIT_EXPECT_EQ(test, mode.xres, 720);
@@ -248,7 +248,7 @@ static void drm_cmdline_test_res_bpp_refresh(struct kunit *test)
248248
struct drm_cmdline_mode mode = { };
249249
const char *cmdline = "720x480-24@60";
250250

251-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
251+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
252252
&no_connector, &mode));
253253
KUNIT_EXPECT_TRUE(test, mode.specified);
254254
KUNIT_EXPECT_EQ(test, mode.xres, 720);
@@ -272,7 +272,7 @@ static void drm_cmdline_test_res_bpp_refresh_interlaced(struct kunit *test)
272272
struct drm_cmdline_mode mode = { };
273273
const char *cmdline = "720x480-24@60i";
274274

275-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
275+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
276276
&no_connector, &mode));
277277
KUNIT_EXPECT_TRUE(test, mode.specified);
278278
KUNIT_EXPECT_EQ(test, mode.xres, 720);
@@ -294,9 +294,9 @@ static void drm_cmdline_test_res_bpp_refresh_interlaced(struct kunit *test)
294294
static void drm_cmdline_test_res_bpp_refresh_margins(struct kunit *test)
295295
{
296296
struct drm_cmdline_mode mode = { };
297-
const char *cmdline = "720x480-24@60m";
297+
const char *cmdline = "720x480-24@60m";
298298

299-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
299+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
300300
&no_connector, &mode));
301301
KUNIT_EXPECT_TRUE(test, mode.specified);
302302
KUNIT_EXPECT_EQ(test, mode.xres, 720);
@@ -318,9 +318,9 @@ static void drm_cmdline_test_res_bpp_refresh_margins(struct kunit *test)
318318
static void drm_cmdline_test_res_bpp_refresh_force_off(struct kunit *test)
319319
{
320320
struct drm_cmdline_mode mode = { };
321-
const char *cmdline = "720x480-24@60d";
321+
const char *cmdline = "720x480-24@60d";
322322

323-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
323+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
324324
&no_connector, &mode));
325325
KUNIT_EXPECT_TRUE(test, mode.specified);
326326
KUNIT_EXPECT_EQ(test, mode.xres, 720);
@@ -342,9 +342,9 @@ static void drm_cmdline_test_res_bpp_refresh_force_off(struct kunit *test)
342342
static void drm_cmdline_test_res_bpp_refresh_force_on(struct kunit *test)
343343
{
344344
struct drm_cmdline_mode mode = { };
345-
const char *cmdline = "720x480-24@60e";
345+
const char *cmdline = "720x480-24@60e";
346346

347-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
347+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
348348
&no_connector, &mode));
349349
KUNIT_EXPECT_TRUE(test, mode.specified);
350350
KUNIT_EXPECT_EQ(test, mode.xres, 720);
@@ -368,7 +368,7 @@ static void drm_cmdline_test_res_bpp_refresh_force_on_analog(struct kunit *test)
368368
struct drm_cmdline_mode mode = { };
369369
const char *cmdline = "720x480-24@60D";
370370

371-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
371+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
372372
&no_connector, &mode));
373373
KUNIT_EXPECT_TRUE(test, mode.specified);
374374
KUNIT_EXPECT_EQ(test, mode.xres, 720);
@@ -395,7 +395,7 @@ static void drm_cmdline_test_res_bpp_refresh_force_on_digital(struct kunit *test
395395
};
396396
const char *cmdline = "720x480-24@60D";
397397

398-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
398+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
399399
&connector, &mode));
400400
KUNIT_EXPECT_TRUE(test, mode.specified);
401401
KUNIT_EXPECT_EQ(test, mode.xres, 720);
@@ -443,7 +443,7 @@ static void drm_cmdline_test_res_margins_force_on(struct kunit *test)
443443
struct drm_cmdline_mode mode = { };
444444
const char *cmdline = "720x480me";
445445

446-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
446+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
447447
&no_connector, &mode));
448448
KUNIT_EXPECT_TRUE(test, mode.specified);
449449
KUNIT_EXPECT_EQ(test, mode.xres, 720);
@@ -465,7 +465,7 @@ static void drm_cmdline_test_res_vesa_margins(struct kunit *test)
465465
struct drm_cmdline_mode mode = { };
466466
const char *cmdline = "720x480Mm";
467467

468-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
468+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
469469
&no_connector, &mode));
470470
KUNIT_EXPECT_TRUE(test, mode.specified);
471471
KUNIT_EXPECT_EQ(test, mode.xres, 720);
@@ -487,7 +487,7 @@ static void drm_cmdline_test_name(struct kunit *test)
487487
struct drm_cmdline_mode mode = { };
488488
const char *cmdline = "NTSC";
489489

490-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
490+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
491491
&no_connector, &mode));
492492
KUNIT_EXPECT_STREQ(test, mode.name, "NTSC");
493493
KUNIT_EXPECT_FALSE(test, mode.refresh_specified);
@@ -499,7 +499,7 @@ static void drm_cmdline_test_name_bpp(struct kunit *test)
499499
struct drm_cmdline_mode mode = { };
500500
const char *cmdline = "NTSC-24";
501501

502-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
502+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
503503
&no_connector, &mode));
504504
KUNIT_EXPECT_STREQ(test, mode.name, "NTSC");
505505

@@ -514,7 +514,7 @@ static void drm_cmdline_test_name_option(struct kunit *test)
514514
struct drm_cmdline_mode mode = { };
515515
const char *cmdline = "NTSC,rotate=180";
516516

517-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
517+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
518518
&no_connector, &mode));
519519
KUNIT_EXPECT_TRUE(test, mode.specified);
520520
KUNIT_EXPECT_STREQ(test, mode.name, "NTSC");
@@ -526,7 +526,7 @@ static void drm_cmdline_test_name_bpp_option(struct kunit *test)
526526
struct drm_cmdline_mode mode = { };
527527
const char *cmdline = "NTSC-24,rotate=180";
528528

529-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
529+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
530530
&no_connector, &mode));
531531
KUNIT_EXPECT_TRUE(test, mode.specified);
532532
KUNIT_EXPECT_STREQ(test, mode.name, "NTSC");
@@ -540,7 +540,7 @@ static void drm_cmdline_test_rotate_0(struct kunit *test)
540540
struct drm_cmdline_mode mode = { };
541541
const char *cmdline = "720x480,rotate=0";
542542

543-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
543+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
544544
&no_connector, &mode));
545545
KUNIT_EXPECT_TRUE(test, mode.specified);
546546
KUNIT_EXPECT_EQ(test, mode.xres, 720);
@@ -563,7 +563,7 @@ static void drm_cmdline_test_rotate_90(struct kunit *test)
563563
struct drm_cmdline_mode mode = { };
564564
const char *cmdline = "720x480,rotate=90";
565565

566-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
566+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
567567
&no_connector, &mode));
568568
KUNIT_EXPECT_TRUE(test, mode.specified);
569569
KUNIT_EXPECT_EQ(test, mode.xres, 720);
@@ -586,7 +586,7 @@ static void drm_cmdline_test_rotate_180(struct kunit *test)
586586
struct drm_cmdline_mode mode = { };
587587
const char *cmdline = "720x480,rotate=180";
588588

589-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
589+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
590590
&no_connector, &mode));
591591
KUNIT_EXPECT_TRUE(test, mode.specified);
592592
KUNIT_EXPECT_EQ(test, mode.xres, 720);
@@ -609,7 +609,7 @@ static void drm_cmdline_test_rotate_270(struct kunit *test)
609609
struct drm_cmdline_mode mode = { };
610610
const char *cmdline = "720x480,rotate=270";
611611

612-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
612+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
613613
&no_connector, &mode));
614614
KUNIT_EXPECT_TRUE(test, mode.specified);
615615
KUNIT_EXPECT_EQ(test, mode.xres, 720);
@@ -632,7 +632,7 @@ static void drm_cmdline_test_hmirror(struct kunit *test)
632632
struct drm_cmdline_mode mode = { };
633633
const char *cmdline = "720x480,reflect_x";
634634

635-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
635+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
636636
&no_connector, &mode));
637637
KUNIT_EXPECT_TRUE(test, mode.specified);
638638
KUNIT_EXPECT_EQ(test, mode.xres, 720);
@@ -655,7 +655,7 @@ static void drm_cmdline_test_vmirror(struct kunit *test)
655655
struct drm_cmdline_mode mode = { };
656656
const char *cmdline = "720x480,reflect_y";
657657

658-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
658+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
659659
&no_connector, &mode));
660660
KUNIT_EXPECT_TRUE(test, mode.specified);
661661
KUNIT_EXPECT_EQ(test, mode.xres, 720);
@@ -679,7 +679,7 @@ static void drm_cmdline_test_margin_options(struct kunit *test)
679679
const char *cmdline =
680680
"720x480,margin_right=14,margin_left=24,margin_bottom=36,margin_top=42";
681681

682-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
682+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
683683
&no_connector, &mode));
684684
KUNIT_EXPECT_TRUE(test, mode.specified);
685685
KUNIT_EXPECT_EQ(test, mode.xres, 720);
@@ -705,7 +705,7 @@ static void drm_cmdline_test_multiple_options(struct kunit *test)
705705
struct drm_cmdline_mode mode = { };
706706
const char *cmdline = "720x480,rotate=270,reflect_x";
707707

708-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
708+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
709709
&no_connector, &mode));
710710
KUNIT_EXPECT_TRUE(test, mode.specified);
711711
KUNIT_EXPECT_EQ(test, mode.xres, 720);
@@ -728,7 +728,7 @@ static void drm_cmdline_test_bpp_extra_and_option(struct kunit *test)
728728
struct drm_cmdline_mode mode = { };
729729
const char *cmdline = "720x480-24e,rotate=180";
730730

731-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
731+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
732732
&no_connector, &mode));
733733
KUNIT_EXPECT_TRUE(test, mode.specified);
734734
KUNIT_EXPECT_EQ(test, mode.xres, 720);
@@ -752,7 +752,7 @@ static void drm_cmdline_test_extra_and_option(struct kunit *test)
752752
struct drm_cmdline_mode mode = { };
753753
const char *cmdline = "720x480e,rotate=180";
754754

755-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
755+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
756756
&no_connector, &mode));
757757
KUNIT_EXPECT_TRUE(test, mode.specified);
758758
KUNIT_EXPECT_EQ(test, mode.xres, 720);
@@ -774,7 +774,7 @@ static void drm_cmdline_test_freestanding_options(struct kunit *test)
774774
struct drm_cmdline_mode mode = { };
775775
const char *cmdline = "margin_right=14,margin_left=24,margin_bottom=36,margin_top=42";
776776

777-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
777+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
778778
&no_connector, &mode));
779779
KUNIT_EXPECT_FALSE(test, mode.specified);
780780
KUNIT_EXPECT_FALSE(test, mode.refresh_specified);
@@ -797,7 +797,7 @@ static void drm_cmdline_test_freestanding_force_e_and_options(struct kunit *test
797797
struct drm_cmdline_mode mode = { };
798798
const char *cmdline = "e,margin_right=14,margin_left=24,margin_bottom=36,margin_top=42";
799799

800-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
800+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
801801
&no_connector, &mode));
802802
KUNIT_EXPECT_FALSE(test, mode.specified);
803803
KUNIT_EXPECT_FALSE(test, mode.refresh_specified);
@@ -820,7 +820,7 @@ static void drm_cmdline_test_panel_orientation(struct kunit *test)
820820
struct drm_cmdline_mode mode = { };
821821
const char *cmdline = "panel_orientation=upside_down";
822822

823-
KUNIT_EXPECT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
823+
KUNIT_ASSERT_TRUE(test, drm_mode_parse_command_line_for_connector(cmdline,
824824
&no_connector, &mode));
825825
KUNIT_EXPECT_FALSE(test, mode.specified);
826826
KUNIT_EXPECT_FALSE(test, mode.refresh_specified);

0 commit comments

Comments
 (0)