Fixed some small errors due to rebase of e491814

Signed-off-by: Cristian Maglie <[email protected]>

Author: cmaglie

Diff for: src/arduino.cc/arduino-builder/main.go

@@ -160,6 +160,11 @@ func init() {
 func main() {
 	flag.Parse()
 
+	for _, t := range customBuildPropertiesFlag {
+		fmt.Println(t)
+	}
+	return
+
 	if *versionFlag {
 		fmt.Println("Arduino Builder " + VERSION)
 		fmt.Println("Copyright (C) 2015 Arduino LLC and contributors")

Diff for: src/arduino.cc/builder/test/ctags_to_prototypes_test.go

@@ -30,15 +30,16 @@
 package test
 
 import (
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"testing"
+
 	"arduino.cc/builder"
 	"arduino.cc/builder/constants"
 	"arduino.cc/builder/ctags"
 	"arduino.cc/builder/types"
 	"github.com/stretchr/testify/require"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"testing"
 )
 
 func TestCTagsToPrototypesShouldListPrototypes(t *testing.T) {
@@ -474,7 +475,6 @@ func TestCTagsRunnerSketchWithClassFunction(t *testing.T) {
 		&builder.CTagsTargetFileSaver{Source: &ctx.Source, TargetFileName: constants.FILE_CTAGS_TARGET},
 		&ctags.CTagsRunner{},
 		&ctags.CTagsParser{},
-		&CollectCtagsFromPreprocSource{},
 		&ctags.CTagsToPrototypes{},
 	}