Skip to content

Commit 2a5355f

Browse files
volks73volks73
committed
Fix usage of assert methods
The `with_stdout_contains` was mis-used. Since some lines may or may not appear for some compiler targets and environments (nightly, beta, stable, etc.) the tests would fail because the output was not identical. Instead of a using raw strings, each line with the arch, endian, env, family, vendor, pointer_width, etc. that are known to always be present (at least of the CI builds) are included. This should work for the CI environments and my local environment.
1 parent 9b02dd4 commit 2a5355f

File tree

1 file changed

+44
-161
lines changed

1 file changed

+44
-161
lines changed

‎tests/testsuite/rustc.rs

Lines changed: 44 additions & 161 deletions
Original file line numberDiff line numberDiff line change
@@ -468,39 +468,15 @@ fn rustc_with_print_cfg_single_target() {
468468

469469
p.cargo("rustc -Z unstable-options --target x86_64-pc-windows-msvc --print cfg")
470470
.masquerade_as_nightly_cargo()
471-
.with_stdout_contains(
472-
"\
473-
debug_assertions
474-
panic=\"unwind\"
475-
target_arch=\"x86_64\"
476-
target_endian=\"little\"
477-
target_env=\"msvc\"
478-
target_family=\"windows\"
479-
target_feature=\"fxsr\"
480-
target_feature=\"sse\"
481-
target_feature=\"sse2\"
482-
target_has_atomic=\"16\"
483-
target_has_atomic=\"32\"
484-
target_has_atomic=\"64\"
485-
target_has_atomic=\"8\"
486-
target_has_atomic=\"ptr\"
487-
target_has_atomic_equal_alignment=\"16\"
488-
target_has_atomic_equal_alignment=\"32\"
489-
target_has_atomic_equal_alignment=\"64\"
490-
target_has_atomic_equal_alignment=\"8\"
491-
target_has_atomic_equal_alignment=\"ptr\"
492-
target_has_atomic_load_store=\"16\"
493-
target_has_atomic_load_store=\"32\"
494-
target_has_atomic_load_store=\"64\"
495-
target_has_atomic_load_store=\"8\"
496-
target_has_atomic_load_store=\"ptr\"
497-
target_os=\"windows\"
498-
target_pointer_width=\"64\"
499-
target_thread_local
500-
target_vendor=\"pc\"
501-
windows
502-
",
503-
)
471+
.with_stdout_contains("debug_assertions")
472+
.with_stdout_contains("target_arch=\"x86_64\"")
473+
.with_stdout_contains("target_endian=\"little\"")
474+
.with_stdout_contains("target_env=\"msvc\"")
475+
.with_stdout_contains("target_family=\"windows\"")
476+
.with_stdout_contains("target_os=\"windows\"")
477+
.with_stdout_contains("target_pointer_width=\"64\"")
478+
.with_stdout_contains("target_vendor=\"pc\"")
479+
.with_stdout_contains("windows")
504480
.run();
505481
}
506482

@@ -513,66 +489,21 @@ fn rustc_with_print_cfg_multiple_targets() {
513489

514490
p.cargo("rustc -Z unstable-options -Z multitarget --target x86_64-pc-windows-msvc --target i686-unknown-linux-gnu --print cfg")
515491
.masquerade_as_nightly_cargo()
516-
.with_stdout_contains(
517-
"\
518-
debug_assertions
519-
target_arch=\"x86\"
520-
target_endian=\"little\"
521-
target_env=\"gnu\"
522-
target_family=\"unix\"
523-
target_feature=\"fxsr\"
524-
target_feature=\"sse\"
525-
target_feature=\"sse2\"
526-
target_has_atomic=\"16\"
527-
target_has_atomic=\"32\"
528-
target_has_atomic=\"64\"
529-
target_has_atomic=\"8\"
530-
target_has_atomic=\"ptr\"
531-
target_has_atomic_equal_alignment=\"16\"
532-
target_has_atomic_equal_alignment=\"32\"
533-
target_has_atomic_equal_alignment=\"8\"
534-
target_has_atomic_equal_alignment=\"ptr\"
535-
target_has_atomic_load_store=\"16\"
536-
target_has_atomic_load_store=\"32\"
537-
target_has_atomic_load_store=\"64\"
538-
target_has_atomic_load_store=\"8\"
539-
target_has_atomic_load_store=\"ptr\"
540-
target_os=\"linux\"
541-
target_pointer_width=\"32\"
542-
target_thread_local
543-
target_vendor=\"unknown\"
544-
unix
545-
546-
debug_assertions
547-
panic=\"unwind\"
548-
target_arch=\"x86_64\"
549-
target_endian=\"little\"
550-
target_env=\"msvc\"
551-
target_family=\"windows\"
552-
target_feature=\"fxsr\"
553-
target_feature=\"sse\"
554-
target_feature=\"sse2\"
555-
target_has_atomic=\"16\"
556-
target_has_atomic=\"32\"
557-
target_has_atomic=\"64\"
558-
target_has_atomic=\"8\"
559-
target_has_atomic=\"ptr\"
560-
target_has_atomic_equal_alignment=\"16\"
561-
target_has_atomic_equal_alignment=\"32\"
562-
target_has_atomic_equal_alignment=\"64\"
563-
target_has_atomic_equal_alignment=\"8\"
564-
target_has_atomic_equal_alignment=\"ptr\"
565-
target_has_atomic_load_store=\"16\"
566-
target_has_atomic_load_store=\"32\"
567-
target_has_atomic_load_store=\"64\"
568-
target_has_atomic_load_store=\"8\"
569-
target_has_atomic_load_store=\"ptr\"
570-
target_os=\"windows\"
571-
target_pointer_width=\"64\"
572-
target_thread_local
573-
target_vendor=\"pc\"
574-
windows",
575-
)
492+
.with_stdout_contains("debug_assertions")
493+
.with_stdout_contains("target_arch=\"x86_64\"")
494+
.with_stdout_contains("target_endian=\"little\"")
495+
.with_stdout_contains("target_env=\"msvc\"")
496+
.with_stdout_contains("target_family=\"windows\"")
497+
.with_stdout_contains("target_os=\"windows\"")
498+
.with_stdout_contains("target_pointer_width=\"64\"")
499+
.with_stdout_contains("target_vendor=\"pc\"")
500+
.with_stdout_contains("windows")
501+
.with_stdout_contains("target_env=\"gnu\"")
502+
.with_stdout_contains("target_family=\"unix\"")
503+
.with_stdout_contains("target_pointer_width=\"32\"")
504+
.with_stdout_contains("target_vendor=\"unknown\"")
505+
.with_stdout_contains("target_os=\"linux\"")
506+
.with_stdout_contains("unix")
576507
.run();
577508
}
578509

@@ -586,40 +517,16 @@ fn rustc_with_print_cfg_rustflags_env_var() {
586517
p.cargo("rustc -Z unstable-options --target x86_64-pc-windows-msvc --print cfg")
587518
.masquerade_as_nightly_cargo()
588519
.env("RUSTFLAGS", "-C target-feature=+crt-static")
589-
.with_stdout_contains(
590-
"\
591-
debug_assertions
592-
panic=\"unwind\"
593-
target_arch=\"x86_64\"
594-
target_endian=\"little\"
595-
target_env=\"msvc\"
596-
target_family=\"windows\"
597-
target_feature=\"crt-static\"
598-
target_feature=\"fxsr\"
599-
target_feature=\"sse\"
600-
target_feature=\"sse2\"
601-
target_has_atomic=\"16\"
602-
target_has_atomic=\"32\"
603-
target_has_atomic=\"64\"
604-
target_has_atomic=\"8\"
605-
target_has_atomic=\"ptr\"
606-
target_has_atomic_equal_alignment=\"16\"
607-
target_has_atomic_equal_alignment=\"32\"
608-
target_has_atomic_equal_alignment=\"64\"
609-
target_has_atomic_equal_alignment=\"8\"
610-
target_has_atomic_equal_alignment=\"ptr\"
611-
target_has_atomic_load_store=\"16\"
612-
target_has_atomic_load_store=\"32\"
613-
target_has_atomic_load_store=\"64\"
614-
target_has_atomic_load_store=\"8\"
615-
target_has_atomic_load_store=\"ptr\"
616-
target_os=\"windows\"
617-
target_pointer_width=\"64\"
618-
target_thread_local
619-
target_vendor=\"pc\"
620-
windows
621-
",
622-
)
520+
.with_stdout_contains("debug_assertions")
521+
.with_stdout_contains("target_arch=\"x86_64\"")
522+
.with_stdout_contains("target_endian=\"little\"")
523+
.with_stdout_contains("target_env=\"msvc\"")
524+
.with_stdout_contains("target_family=\"windows\"")
525+
.with_stdout_contains("target_feature=\"crt-static\"")
526+
.with_stdout_contains("target_os=\"windows\"")
527+
.with_stdout_contains("target_pointer_width=\"64\"")
528+
.with_stdout_contains("target_vendor=\"pc\"")
529+
.with_stdout_contains("windows")
623530
.run();
624531
}
625532

@@ -640,39 +547,15 @@ rustflags = ["-C", "target-feature=+crt-static"]
640547
p.cargo("rustc -Z unstable-options --target x86_64-pc-windows-msvc --print cfg")
641548
.masquerade_as_nightly_cargo()
642549
.env("RUSTFLAGS", "-C target-feature=+crt-static")
643-
.with_stdout_contains(
644-
"\
645-
debug_assertions
646-
panic=\"unwind\"
647-
target_arch=\"x86_64\"
648-
target_endian=\"little\"
649-
target_env=\"msvc\"
650-
target_family=\"windows\"
651-
target_feature=\"crt-static\"
652-
target_feature=\"fxsr\"
653-
target_feature=\"sse\"
654-
target_feature=\"sse2\"
655-
target_has_atomic=\"16\"
656-
target_has_atomic=\"32\"
657-
target_has_atomic=\"64\"
658-
target_has_atomic=\"8\"
659-
target_has_atomic=\"ptr\"
660-
target_has_atomic_equal_alignment=\"16\"
661-
target_has_atomic_equal_alignment=\"32\"
662-
target_has_atomic_equal_alignment=\"64\"
663-
target_has_atomic_equal_alignment=\"8\"
664-
target_has_atomic_equal_alignment=\"ptr\"
665-
target_has_atomic_load_store=\"16\"
666-
target_has_atomic_load_store=\"32\"
667-
target_has_atomic_load_store=\"64\"
668-
target_has_atomic_load_store=\"8\"
669-
target_has_atomic_load_store=\"ptr\"
670-
target_os=\"windows\"
671-
target_pointer_width=\"64\"
672-
target_thread_local
673-
target_vendor=\"pc\"
674-
windows
675-
",
676-
)
550+
.with_stdout_contains("debug_assertions")
551+
.with_stdout_contains("target_arch=\"x86_64\"")
552+
.with_stdout_contains("target_endian=\"little\"")
553+
.with_stdout_contains("target_env=\"msvc\"")
554+
.with_stdout_contains("target_family=\"windows\"")
555+
.with_stdout_contains("target_feature=\"crt-static\"")
556+
.with_stdout_contains("target_os=\"windows\"")
557+
.with_stdout_contains("target_pointer_width=\"64\"")
558+
.with_stdout_contains("target_vendor=\"pc\"")
559+
.with_stdout_contains("windows")
677560
.run();
678561
}

0 commit comments

Comments
 (0)