diff options
| author | Jonathon Jongsma <jjongsma@gnome.org> | 2008-12-20 17:00:20 -0600 |
|---|---|---|
| committer | Jonathon Jongsma <jjongsma@gnome.org> | 2008-12-20 17:00:20 -0600 |
| commit | 72bfac8b3ee7b7e2ed00689e186dd3dc765134df (patch) | |
| tree | 6c547e172c2b1a4f94146ad63bb4fdc62aef5ebd | |
| parent | 4541764961e9ff8ab95ef6b04a0557f5ff77ff34 (diff) | |
fix some distcheck failuresv1.7.2
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | tests/test-matrix.cc | 2 | ||||
| -rw-r--r-- | tests/test-user-font.cc | 6 |
4 files changed, 11 insertions, 5 deletions
@@ -1,5 +1,12 @@ 2008-12-20 Jonathon Jongsma <jonathon@quotidian.org> + * configure.in: + * tests/test-matrix.cc: + * tests/test-user-font.cc: fix some test build issues that were causing + distcheck to fail + +2008-12-20 Jonathon Jongsma <jonathon@quotidian.org> + * NEWS: * configure.in: update for release diff --git a/configure.in b/configure.in index 2382fa4..577ce60 100644 --- a/configure.in +++ b/configure.in @@ -228,7 +228,6 @@ if test x$ENABLE_TESTS = xyes ; then ####################################################### AX_BOOST_BASE([1.33.1]) AX_BOOST_UNIT_TEST_FRAMEWORK - AX_BOOST_TEST_EXEC_MONITOR dnl AX_BOOST_BASE defines a --with-boost[=DIR] option that sets dnl $ac_boost_path as a custom boost prefix, so use that if it was specified diff --git a/tests/test-matrix.cc b/tests/test-matrix.cc index 8e40d01..02ed4a2 100644 --- a/tests/test-matrix.cc +++ b/tests/test-matrix.cc @@ -99,7 +99,7 @@ void test_cast() void test_multiply() { - Cairo::Matrix A = Cairo::scaled_matrix(2, 4); + Cairo::Matrix A = Cairo::scaling_matrix(2, 4); Cairo::Matrix B = Cairo::translation_matrix(5.3, 1.2); Cairo::Matrix C = A * B; Cairo::Matrix D; diff --git a/tests/test-user-font.cc b/tests/test-user-font.cc index a7d9647..75ae566 100644 --- a/tests/test-user-font.cc +++ b/tests/test-user-font.cc @@ -274,7 +274,7 @@ void test_user_font_exception() // abort, we should get an exception here. Cairo::RefPtr<Cairo::ScaledFont> scaled_font; BOOST_CHECK_THROW (scaled_font = Cairo::ScaledFont::create(font, - Cairo::scaled_matrix(10, 10), + Cairo::scaling_matrix(10, 10), Cairo::identity_matrix(), Cairo::FontOptions()), Cairo::logic_error); @@ -283,7 +283,7 @@ void test_user_font_exception() // now test when an exception is thrown in unicode_to_glyph font = ExceptionUserFont::create(ExceptionUserFont::FLAG_UNICODE); BOOST_CHECK_NO_THROW (scaled_font = Cairo::ScaledFont::create(font, - Cairo::scaled_matrix(10, 10), + Cairo::scaling_matrix(10, 10), Cairo::identity_matrix(), Cairo::FontOptions())); TestSetup setup; @@ -300,7 +300,7 @@ void test_user_font_exception() // now test when an exception is thrown in render_glyph font = ExceptionUserFont::create(ExceptionUserFont::FLAG_RENDER); BOOST_CHECK_NO_THROW (scaled_font = Cairo::ScaledFont::create(font, - Cairo::scaled_matrix(10, 10), + Cairo::scaling_matrix(10, 10), Cairo::identity_matrix(), Cairo::FontOptions())); // need a new setup since the old cr is now in an error state, so attemtping |