[cairo-commit] 2 commits - src/check-preprocessor-syntax.sh test/testtable.js

[Chris Wilson]

 src/check-preprocessor-syntax.sh |    4 ++--
 test/testtable.js                |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a8abf3a48b588632e3f39028b0b978d73c362f46
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Oct 9 10:43:15 2014 +0100

    test: Fix conflation of different device scales in index.html
    
    Currently testtable.js does not recognise the difference between running
    the same test with multiple scale factors and merges the results into
    one.

diff --git a/test/testtable.js b/test/testtable.js
index 6c25938..4fc664f 100644
--- a/test/testtable.js
+++ b/test/testtable.js
@@ -21,7 +21,7 @@ resultToString = {
 };
 
 resultField = "result";
-rowFields = [ "test", "offset", "similar" ];
+rowFields = [ "test", "offset", "scale", "similar" ];
 colFields = [ "target", "format" ];
 allFields = [ resultField ].concat (rowFields, colFields);
 
commit 8047179bfca65cad36c61daf5f88c97cc971848b
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Oct 9 10:54:58 2014 +0100

    test: Teach check-preprocessor-syntax.sh about -inlines.h

diff --git a/src/check-preprocessor-syntax.sh b/src/check-preprocessor-syntax.sh
index c415415..b718f60 100755
--- a/src/check-preprocessor-syntax.sh
+++ b/src/check-preprocessor-syntax.sh
@@ -9,10 +9,10 @@ stat=0
 
 
 HEADERS=$all_cairo_headers
-test "x$HEADERS" = x && HEADERS=`find . -name 'cairo*.h' ! -name 'cairo*-private.h' ! -name 'cairoint.h'`
+test "x$HEADERS" = x && HEADERS=`find . -name 'cairo*.h' ! -name 'cairo*-private.h' ! -name 'cairo*-inline.h' ! -name 'cairoint.h'`
 
 PRIVATE=$all_cairo_private
-test "x$PRIVATE" = x && PRIVATE=`find . -name 'cairo*-private.h' -or -name 'cairoint.h'`
+test "x$PRIVATE" = x && PRIVATE=`find . -name 'cairo*-private.h' -or -name 'cairo*-inline.h' -or -name 'cairoint.h'`
 
 SOURCES=$all_cairo_sources
 test "x$SOURCES" = x && SOURCES=`find . -name 'cairo*.c' -or -name 'cairo*.cpp'`