update CI-related stuff

mpictor · mpictor · commit 2dace5da2e4f · 2015-07-19T15:02:54.000-04:00
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -47,8 +47,6 @@ build_script:
     cmake -version
     grep --version
     cmake .. -DSC_ENABLE_TESTING=ON -G"$env:GENERATOR" -DSC_BUILD_SCHEMAS="ifc2x3;ap214e3;ap209"
-    dir *.sln
-    dir *.vcxproj
     echo "filtering build output with grep"
     cmake --build . --config Debug | grep -ve "CMake does not need to re-run because" -e "ZERO_CHECK.ZERO_CHECK" -e "^  Creating directory"
 
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ sudo: false
 language: cpp
 compiler:
   - clang
-script: mkdir build && cd build && cmake .. -DSC_ENABLE_TESTING=ON && make -j3 && ctest -j2; if [ $? -ne 0 ]; then echo; echo; echo "-----------------------------"; grep -niB20 "Test Failed" Testing/Temporary/LastTest.log && false; fi
+script: mkdir build && cd build && cmake .. -DSC_ENABLE_TESTING=ON && make -j3 && ctest -j2 --output-on-failure
 branches:
   only:
     - master
diff --git a/misc/summarize-appveyor-log.go b/misc/summarize-appveyor-log.go
@@ -18,11 +18,12 @@ func main() {
 	printMessages("warning", warns)
 }
 
-/* the regex will match lines like
-[ 00:03:42] c:\projects\stepcode\src\base\sc_benchmark.h(45): war*ning C4251: 'benchmark::descr' : class 'std::basic_string<char,std::char_traits<char>,std::allocator<char>>' needs to have dll-interface to be used by clients of class 'benchmark' [C:\projects\STEPcode\build\src\base\base.vcxproj]
+/* categorizes warnings and errors based upon the MSVC message number (i.e. C4244)
+ * the regex will match lines like
+[ 00:03:42] c:\projects\stepcode\src\base\sc_benchmark.h(45): warning C4251: 'benchmark::descr' : class 'std::basic_string<char,std::char_traits<char>,std::allocator<char>>' needs to have dll-interface to be used by clients of class 'benchmark' [C:\projects\STEPcode\build\src\base\base.vcxproj]
 [00:03:48] C:\projects\STEPcode\src\base\sc_benchmark.cc(61): warning C4244: '=' : conversion from 'SIZE_T' to 'long', possible loss of data [C:\projects\STEPcode\build\src\base\base.vcxproj]*
 */
-func countMessages(log string) (warns, errs map[string][]string) {
+func countMessages(log []string) (warns, errs map[string][]string) {
 	warns = make(map[string][]string)
 	errs = make(map[string][]string)
 	tstamp := `\[\d\d:\d\d:\d\d\] `
@@ -33,9 +34,10 @@ func countMessages(log string) (warns, errs map[string][]string) {
 	tail := `\[[^\[\]]*\]`
 	warnRe := regexp.MustCompile(tstamp + fname + fline + `warning ` + msgNr + msgTxt + tail)
 	errRe := regexp.MustCompile(tstamp + fname + fline + `(?:fatal )?error ` + msgNr + msgTxt + tail)
-	reScanner := bufio.NewScanner(strings.NewReader(log))
-	for reScanner.Scan() {
-		line := reScanner.Text()
+	//reScanner := bufio.NewScanner(strings.NewReader(...log))
+	//for reScanner.Scan() {
+		//line := reScanner.Text()
+	for _,line := range log {
 		if warnRe.MatchString(line) {
 			key := warnRe.ReplaceAllString(line, "$3")
 			path := strings.ToLower(warnRe.ReplaceAllString(line, "$1:$2"))
@@ -94,23 +96,29 @@ func printMessages(typ string, m map[string][]string) {
 	}
 }
 
-func unwrap() (log string) {
-	//read stdin, write stdout
-	newline := true
+//
+func unwrap() (log []string) {
+	startNewLine := true
 	unwrapScanner := bufio.NewScanner(os.Stdin)
+	var lineOut string
 	for unwrapScanner.Scan() {
-		lastNewline := newline
-		line := unwrapScanner.Text()
-		newline = (len(line) < 240)
+		lastNewline := startNewLine
+		lineIn := unwrapScanner.Text()
+		startNewLine = (len(lineIn) < 240) || strings.HasSuffix(lineIn,"vcxproj]")
 		if !lastNewline {
-			log += fmt.Sprintf("%s", line[11:])
+			lineOut += lineIn[11:]
 		} else {
-			log += fmt.Sprintf("%s", line)
+			lineOut = lineIn
 		}
-		if newline {
-			log += fmt.Sprintf("\n")
+		if startNewLine {
+			log = append(log,lineOut)
+			lineOut = ""
+			//log += fmt.Sprintf("\n")
 		}
 	}
+	if len(lineOut) > 0 {
+		log = append(log,lineOut)
+	}
 	if err := unwrapScanner.Err(); err != nil {
 		fmt.Fprintln(os.Stderr, "Error reading appveyor log:", err)
 	}
