File tree Expand file tree Collapse file tree 2 files changed +33
-4
lines changed Expand file tree Collapse file tree 2 files changed +33
-4
lines changed Original file line number Diff line number Diff line change
1
+ name : Rust
2
+
3
+ on :
4
+ push :
5
+ branches : [ master, develop ]
6
+ pull_request :
7
+ branches : [ master, develop ]
8
+
9
+ jobs :
10
+ build :
11
+
12
+ strategy :
13
+ matrix :
14
+ os : [ macos-latest, windows-latest, ubuntu-latest ]
15
+
16
+ runs-on : ${{ matrix.os }}
17
+
18
+ steps :
19
+ - uses : actions/checkout@v2
20
+ - name : Build
21
+ run : cargo build --verbose
22
+ - name : Run tests
23
+ run : cargo test --verbose
Original file line number Diff line number Diff line change @@ -43,10 +43,16 @@ fn test_translate_file() -> TerminatingResult {
43
43
let mut expected = Vec :: new ( ) ;
44
44
File :: open ( gold) ?. read_to_end ( & mut expected) ?;
45
45
46
- assert_eq ! (
47
- & std:: str :: from_utf8( & translated) ,
48
- & std:: str :: from_utf8( & expected)
49
- ) ;
46
+ let translated = std:: str:: from_utf8 ( & translated) ?;
47
+ let expected = std:: str:: from_utf8 ( & expected) ?;
48
+
49
+ #[ cfg( target_os = "windows" ) ]
50
+ fn fix_newlines ( t : & str ) -> String { t. replace ( "\r \n " , "\n " ) }
51
+
52
+ #[ cfg( not( target_os = "windows" ) ) ]
53
+ fn fix_newlines ( t : & str ) -> String { t. to_owned ( ) }
54
+
55
+ assert_eq ! ( fix_newlines( translated) , fix_newlines( expected) ) ;
50
56
}
51
57
}
52
58
You can’t perform that action at this time.
0 commit comments