danog/gllvm
1
0
Fork 0
mirror of https://github.com/danog/gllvm.git synced 2024-11-30 08:49:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Keep the formating gods at bay (or PG&E will not restore my power)

Browse Source
This commit is contained in:
Ian A. Mason 2019-10-28 20:47:17 +00:00
parent 28f0ce31f2
commit f464fcac22
3 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shared/extractor.go
View File

@ -229,7 +229,6 @@ func setOutputFile(ea *ExtractionArgs) {
} }
} }
func resolveTool(defaultPath string, envPath string, usrPath string) (path string) { func resolveTool(defaultPath string, envPath string, usrPath string) (path string) {
if usrPath != defaultPath { if usrPath != defaultPath {
path = usrPath path = usrPath
@ -255,7 +254,6 @@ func resolveTool(defaultPath string, envPath string, usrPath string) (path strin
return return
} }
func handleExecutable(ea ExtractionArgs) (success bool) { func handleExecutable(ea ExtractionArgs) (success bool) {
// get the list of bitcode paths // get the list of bitcode paths
artifactPaths := ea.Extractor(ea.InputFile) artifactPaths := ea.Extractor(ea.InputFile)

6
tests/env_and_arg_test.go
View File

@ -2,8 +2,8 @@ package test
import ( import (
"fmt" "fmt"
"os"
"github.com/SRI-CSL/gllvm/shared" "github.com/SRI-CSL/gllvm/shared"
"os"
"testing" "testing"
) )
@ -13,7 +13,7 @@ const (
func checkExecutables(t *testing.T, ea shared.ExtractionArgs, func checkExecutables(t *testing.T, ea shared.ExtractionArgs,
llvmLinker string, llvmArchiver string, archiver string, llvmLinker string, llvmArchiver string, archiver string,
clang string, clangpp string){ clang string, clangpp string) {
if ea.LlvmLinkerName != llvmLinker { if ea.LlvmLinkerName != llvmLinker {
t.Errorf("ParseSwitches: LlvmLinkerName incorrect: %v\n", ea.LlvmLinkerName) t.Errorf("ParseSwitches: LlvmLinkerName incorrect: %v\n", ea.LlvmLinkerName)
} }
@ -82,6 +82,4 @@ func Test_env_and_args(t *testing.T) {
"/the_future_is_here/clang-666", "/the_future_is_here/clang-666",
"/the_future_is_here/clang++-666") "/the_future_is_here/clang++-666")
} }