-
Notifications
You must be signed in to change notification settings - Fork 0
/
0001-tests-Fix-tests-compatibility-with-gocheck.patch
338 lines (304 loc) · 11.1 KB
/
0001-tests-Fix-tests-compatibility-with-gocheck.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
From d27ffadd7d2683431f82e0160b2f6176daf525cb Mon Sep 17 00:00:00 2001
From: Lukas Zaoral <[email protected]>
Date: Thu, 25 Feb 2021 16:50:41 +0100
Subject: [PATCH] tests: Fix compatibility with %gocheck
---
tests/entry_test.go | 79 +++++++++++++++++++--------------------
tests/env_and_arg_test.go | 21 +++++------
tests/parsing_test.go | 11 +++---
3 files changed, 54 insertions(+), 57 deletions(-)
diff --git a/tests/entry_test.go b/tests/entry_test.go
index 0abd9c3..132b38d 100644
--- a/tests/entry_test.go
+++ b/tests/entry_test.go
@@ -1,8 +1,7 @@
-package test
+package shared
import (
"fmt"
- "github.com/SRI-CSL/gllvm/shared"
"runtime"
"testing"
)
@@ -13,14 +12,14 @@ const (
func Test_basic_functionality(t *testing.T) {
args := []string{"../data/helloworld.c", "-o", "../data/hello"}
- exitCode := shared.Compile(args, "clang")
+ exitCode := Compile(args, "clang")
if exitCode != 0 {
t.Errorf("Compile of %v returned %v\n", args, exitCode)
} else if DEBUG {
fmt.Println("Compiled OK")
}
args = []string{"get-bc", "-v", "../data/hello"}
- exitCode = shared.Extract(args)
+ exitCode = Extract(args)
if exitCode != 0 {
t.Errorf("Extraction of %v returned %v\n", args, exitCode)
} else if DEBUG {
@@ -31,27 +30,27 @@ func Test_basic_functionality(t *testing.T) {
func Test_more_functionality(t *testing.T) {
objectFile := "../data/bhello.o"
args := []string{"../data/helloworld.c", "-c", "-o", objectFile}
- exitCode := shared.Compile(args, "clang")
+ exitCode := Compile(args, "clang")
if exitCode != 0 {
t.Errorf("Compile of %v returned %v\n", args, exitCode)
} else if DEBUG {
fmt.Println("Compiled OK")
}
- ok, err := shared.IsObjectFileForOS(objectFile, runtime.GOOS)
+ ok, err := IsObjectFileForOS(objectFile, runtime.GOOS)
if !ok {
t.Errorf("isObjectFileForOS(%v, %v) = %v (err = %v)\n", objectFile, runtime.GOOS, ok, err)
} else if DEBUG {
fmt.Printf("isObjectFileForOS(%v, %v) = %v\n", objectFile, runtime.GOOS, ok)
}
args = []string{objectFile, "-o", "../data/bhello"}
- exitCode = shared.Compile(args, "clang")
+ exitCode = Compile(args, "clang")
if exitCode != 0 {
t.Errorf("Compile of %v returned %v\n", args, exitCode)
} else if DEBUG {
fmt.Println("Compiled OK")
}
args = []string{"get-bc", "-v", "../data/bhello"}
- exitCode = shared.Extract(args)
+ exitCode = Extract(args)
if exitCode != 0 {
t.Errorf("Extraction of %v returned %v\n", args, exitCode)
} else if DEBUG {
@@ -65,39 +64,39 @@ func Test_obscure_functionality(t *testing.T) {
exeFile := "../data/bhello"
opSys := runtime.GOOS
args := []string{sourceFile, "-c", "-o", objectFile}
- exitCode := shared.Compile(args, "clang")
+ exitCode := Compile(args, "clang")
if exitCode != 0 {
t.Errorf("Compile of %v returned %v\n", args, exitCode)
} else if DEBUG {
fmt.Println("Compiled OK")
}
- ok, err := shared.IsObjectFileForOS(sourceFile, opSys)
+ ok, err := IsObjectFileForOS(sourceFile, opSys)
if ok {
t.Errorf("isObjectFileForOS(%v, %v) = %v\n", sourceFile, opSys, ok)
} else if DEBUG {
fmt.Printf("isObjectFileForOS(%v, %v) = %v (err = %v)\n", sourceFile, opSys, ok, err)
}
- ok, err = shared.IsObjectFileForOS(objectFile, opSys)
+ ok, err = IsObjectFileForOS(objectFile, opSys)
if !ok {
t.Errorf("isObjectFileForOS(%v, %v) = %v (err = %v)\n", objectFile, opSys, ok, err)
} else if DEBUG {
fmt.Printf("isObjectFileForOS(%v, %v) = %v\n", objectFile, opSys, ok)
}
args = []string{objectFile, "-o", exeFile}
- exitCode = shared.Compile(args, "clang")
+ exitCode = Compile(args, "clang")
if exitCode != 0 {
t.Errorf("Compile of %v returned %v\n", args, exitCode)
} else if DEBUG {
fmt.Println("Compiled OK")
}
- ok, err = shared.IsObjectFileForOS(exeFile, opSys)
+ ok, err = IsObjectFileForOS(exeFile, opSys)
if ok {
t.Errorf("isObjectFileForOS(%v, %v) = %v\n", exeFile, opSys, ok)
} else if DEBUG {
fmt.Printf("isObjectFileForOS(%v, %v) = %v (err = %v)\n", exeFile, opSys, ok, err)
}
args = []string{"get-bc", "-v", exeFile}
- exitCode = shared.Extract(args)
+ exitCode = Extract(args)
if exitCode != 0 {
t.Errorf("Extraction of %v returned %v\n", args, exitCode)
} else if DEBUG {
@@ -112,79 +111,79 @@ func Test_file_type(t *testing.T) {
objectFile := "../data/bhello.notanextensionthatwerecognize"
exeFile := "../data/bhello"
- var binaryFileType shared.BinaryType
- binaryFileType = shared.GetBinaryType(fictionalFile)
+ var binaryFileType BinaryType
+ binaryFileType = GetBinaryType(fictionalFile)
- if binaryFileType != shared.BinaryUnknown {
+ if binaryFileType != BinaryUnknown {
t.Errorf("GetBinaryType(%v) = %v\n", fictionalFile, binaryFileType)
} else if DEBUG {
fmt.Printf("GetBinaryType(%v) = %v\n", fictionalFile, binaryFileType)
}
- binaryFileType = shared.GetBinaryType(dataDir)
+ binaryFileType = GetBinaryType(dataDir)
- if binaryFileType != shared.BinaryUnknown {
+ if binaryFileType != BinaryUnknown {
t.Errorf("GetBinaryType(%v) = %v\n", dataDir, binaryFileType)
} else if DEBUG {
fmt.Printf("GetBinaryType(%v) = %v\n", dataDir, binaryFileType)
}
- binaryFileType = shared.GetBinaryType(sourceFile)
- if binaryFileType != shared.BinaryUnknown {
+ binaryFileType = GetBinaryType(sourceFile)
+ if binaryFileType != BinaryUnknown {
t.Errorf("GetBinaryType(%v) = %v\n", sourceFile, binaryFileType)
} else if DEBUG {
fmt.Printf("GetBinaryType(%v) = %v\n", sourceFile, binaryFileType)
}
- binaryFileType = shared.GetBinaryType(objectFile)
- if binaryFileType != shared.BinaryObject {
+ binaryFileType = GetBinaryType(objectFile)
+ if binaryFileType != BinaryObject {
t.Errorf("GetBinaryType(%v) = %v\n", objectFile, binaryFileType)
} else if DEBUG {
fmt.Printf("GetBinaryType(%v) = %v\n", objectFile, binaryFileType)
}
- binaryFileType = shared.GetBinaryType(exeFile)
- if binaryFileType != shared.BinaryExecutable {
+ binaryFileType = GetBinaryType(exeFile)
+ if binaryFileType != BinaryExecutable {
t.Errorf("GetBinaryType(%v) = %v\n", exeFile, binaryFileType)
} else if DEBUG {
fmt.Printf("GetBinaryType(%v) = %v\n", exeFile, binaryFileType)
}
var plain bool
- plain = shared.IsPlainFile(fictionalFile)
+ plain = IsPlainFile(fictionalFile)
if plain {
- t.Errorf("shared.IsPlainFile(%v) returned %v\n", fictionalFile, plain)
+ t.Errorf("IsPlainFile(%v) returned %v\n", fictionalFile, plain)
} else if DEBUG {
- fmt.Printf("shared.IsPlainFile(%v) returned %v\n", fictionalFile, plain)
+ fmt.Printf("IsPlainFile(%v) returned %v\n", fictionalFile, plain)
}
- plain = shared.IsPlainFile(dataDir)
+ plain = IsPlainFile(dataDir)
if plain {
- t.Errorf("shared.IsPlainFile(%v) returned %v\n", dataDir, plain)
+ t.Errorf("IsPlainFile(%v) returned %v\n", dataDir, plain)
} else if DEBUG {
- fmt.Printf("shared.IsPlainFile(%v) returned %v\n", dataDir, plain)
+ fmt.Printf("IsPlainFile(%v) returned %v\n", dataDir, plain)
}
- plain = shared.IsPlainFile(sourceFile)
+ plain = IsPlainFile(sourceFile)
if !plain {
- t.Errorf("shared.IsPlainFile(%v) returned %v\n", sourceFile, plain)
+ t.Errorf("IsPlainFile(%v) returned %v\n", sourceFile, plain)
} else if DEBUG {
- fmt.Printf("shared.IsPlainFile(%v) returned %v\n", sourceFile, plain)
+ fmt.Printf("IsPlainFile(%v) returned %v\n", sourceFile, plain)
}
- plain = shared.IsPlainFile(objectFile)
+ plain = IsPlainFile(objectFile)
if !plain {
- t.Errorf("shared.IsPlainFile(%v) returned %v\n", objectFile, plain)
+ t.Errorf("IsPlainFile(%v) returned %v\n", objectFile, plain)
} else if DEBUG {
- fmt.Printf("shared.IsPlainFile(%v) returned %v\n", objectFile, plain)
+ fmt.Printf("IsPlainFile(%v) returned %v\n", objectFile, plain)
}
- plain = shared.IsPlainFile(exeFile)
+ plain = IsPlainFile(exeFile)
if !plain {
- t.Errorf("shared.IsPlainFile(%v) returned %v\n", exeFile, plain)
+ t.Errorf("IsPlainFile(%v) returned %v\n", exeFile, plain)
} else if DEBUG {
- fmt.Printf("shared.IsPlainFile(%v) returned %v\n", exeFile, plain)
+ fmt.Printf("IsPlainFile(%v) returned %v\n", exeFile, plain)
}
}
diff --git a/tests/env_and_arg_test.go b/tests/env_and_arg_test.go
index 2a34d38..de2040e 100644
--- a/tests/env_and_arg_test.go
+++ b/tests/env_and_arg_test.go
@@ -1,8 +1,7 @@
-package test
+package shared
import (
"fmt"
- "github.com/SRI-CSL/gllvm/shared"
"os"
"testing"
)
@@ -11,7 +10,7 @@ const (
verbose = false
)
-func checkExecutables(t *testing.T, ea shared.ExtractionArgs,
+func checkExecutables(t *testing.T, ea ExtractionArgs,
llvmLinker string, llvmArchiver string, archiver string,
clang string, clangpp string) {
if ea.LlvmLinkerName != llvmLinker {
@@ -24,11 +23,11 @@ func checkExecutables(t *testing.T, ea shared.ExtractionArgs,
t.Errorf("ParseSwitches: ArchiverName incorrect: %v\n", ea.ArchiverName)
}
- eclang := shared.GetCompilerExecName("clang")
+ eclang := GetCompilerExecName("clang")
if eclang != clang {
t.Errorf("C compiler not correct: %v\n", eclang)
}
- eclangpp := shared.GetCompilerExecName("clang++")
+ eclangpp := GetCompilerExecName("clang++")
if eclangpp != clangpp {
t.Errorf("C++ compiler not correct: %v\n", eclangpp)
}
@@ -42,12 +41,12 @@ func Test_env_and_args(t *testing.T) {
args := []string{"get-bc", "-v", "../data/hello"}
if verbose {
- shared.PrintEnvironment()
+ PrintEnvironment()
}
- shared.ResetEnvironment()
+ ResetEnvironment()
- ea := shared.ParseSwitches(args)
+ ea := ParseSwitches(args)
if !ea.Verbose {
t.Errorf("ParseSwitches: -v flag not working\n")
}
@@ -67,9 +66,9 @@ func Test_env_and_args(t *testing.T) {
os.Setenv("LLVM_LINK_NAME", "llvm-link-666")
os.Setenv("LLVM_AR_NAME", "llvm-ar-666")
- shared.FetchEnvironment()
+ FetchEnvironment()
- ea = shared.ParseSwitches(args)
+ ea = ParseSwitches(args)
checkExecutables(t, ea,
"/the_future_is_here/llvm-link-666",
@@ -80,7 +79,7 @@ func Test_env_and_args(t *testing.T) {
args = []string{"get-bc", "-a", "llvm-ar-665", "-l", "llvm-link-665", "../data/hello"}
- ea = shared.ParseSwitches(args)
+ ea = ParseSwitches(args)
checkExecutables(t, ea,
"llvm-link-665",
diff --git a/tests/parsing_test.go b/tests/parsing_test.go
index a25f3ee..f8f5046 100644
--- a/tests/parsing_test.go
+++ b/tests/parsing_test.go
@@ -1,7 +1,6 @@
-package test
+package shared
import (
- "github.com/SRI-CSL/gllvm/shared"
"strings"
"testing"
)
@@ -17,8 +16,8 @@ const input3 = `1.c 2.c 3.c 4.c 5.c -Wl,--start-group 7.o 8.o 9.o -Wl,--end-grou
func plto(input string, t *testing.T) {
cmds := strings.Fields(input)
- parsed := shared.Parse(cmds)
- shared.LogInfo("\n<parsed>%v</parsed>", &parsed)
+ parsed := Parse(cmds)
+ LogInfo("\n<parsed>%v</parsed>", &parsed)
if !parsed.IsLTO {
t.Errorf("Parsing of %v FAILED %v (not LTO)\n", input, parsed)
}
@@ -26,8 +25,8 @@ func plto(input string, t *testing.T) {
func pl(input string, t *testing.T, expected int) {
cmds := strings.Fields(input)
- parsed := shared.Parse(cmds)
- shared.LogInfo("\n<parsed>%v</parsed>", &parsed)
+ parsed := Parse(cmds)
+ LogInfo("\n<parsed>%v</parsed>", &parsed)
if expected != len(parsed.LinkArgs) {
t.Errorf("Linking args %v of length %v NOT the expected length %v\n", parsed.LinkArgs, len(parsed.LinkArgs), expected)
}
--
2.29.2