diff -uNrp ../1/src/attributes-test.cpp src/attributes-test.cpp --- ../1/src/attributes-test.cpp 2004-12-22 02:57:27.000000000 -0800 +++ src/attributes-test.cpp 2005-02-05 09:24:06.000000000 -0800 @@ -22,6 +22,7 @@ static struct {char const *attr; bool su {"additive", true}, {"font", true}, {"marker", true}, + {"line-height", true}, {"accent-height", false}, {"accumulate", true}, @@ -437,7 +438,7 @@ test_attributes() for (unsigned id = 1; id < n_ids; ++id) { if (!ids[id]) { unsigned char const *str = sp_attribute_name(id); - printf("%s\n", str); + printf("%s\n", (char const *)str); found = true; } } diff -uNrp ../1/src/display/bezier-utils-test.cpp src/display/bezier-utils-test.cpp --- ../1/src/display/bezier-utils-test.cpp 2004-11-20 03:21:40.000000000 -0800 +++ src/display/bezier-utils-test.cpp 2005-02-05 09:24:06.000000000 -0800 @@ -205,7 +205,7 @@ int main(int argc, char *argv[]) { g_assert( G_N_ELEMENTS(u) == G_N_ELEMENTS(d) ); unsigned max_ix = ~0u; double const err_ratio = compute_max_error_ratio(d, u, G_N_ELEMENTS(d), c, 1.0, &max_ix); - UTEST_ASSERT( sqrt(err_tst[4].err) == err_ratio ); + UTEST_ASSERT( fabs( sqrt(err_tst[4].err) - err_ratio ) < 1e-12 ); UTEST_ASSERT( max_ix == 4 ); } diff -uNrp ../1/src/io/streamtest.cpp src/io/streamtest.cpp --- ../1/src/io/streamtest.cpp 2004-12-30 04:49:16.000000000 -0800 +++ src/io/streamtest.cpp 2005-02-05 09:24:06.000000000 -0800 @@ -1,6 +1,10 @@ #include +#include // realpath +#include // mkdtemp, realpath +#include // chdir +#include // strlen, strncpy, strrchr #include "inkscapestream.h" #include "base64stream.h" @@ -9,10 +13,19 @@ #include "uristream.h" #include "xsltstream.h" +// quick way to pass the name of the executable into the test +char myself[PATH_MAX]; + +// names and path storage for other tests +char *xmlname = "crystalegg.xml"; +char xmlpath[PATH_MAX]; +char *xslname = "doc2html.xsl"; +char xslpath[PATH_MAX]; + bool testUriStream() { printf("######### UriStream copy ############\n"); - Inkscape::URI inUri("streamtest"); + Inkscape::URI inUri(myself); Inkscape::IO::UriInputStream ins(inUri); Inkscape::URI outUri("streamtest.copy"); Inkscape::IO::UriOutputStream outs(outUri); @@ -53,7 +66,7 @@ bool testStdWriter() bool testBase64() { printf("######### Base64 Out ############\n"); - Inkscape::URI plainInUri("crystalegg.xml"); + Inkscape::URI plainInUri(xmlpath); Inkscape::IO::UriInputStream ins1(plainInUri); Inkscape::URI b64OutUri("crystalegg.xml.b64"); @@ -84,12 +97,12 @@ bool testBase64() bool testXslt() { printf("######### XSLT Sheet ############\n"); - Inkscape::URI xsltSheetUri("doc2html.xsl"); + Inkscape::URI xsltSheetUri(xslpath); Inkscape::IO::UriInputStream xsltSheetIns(xsltSheetUri); Inkscape::IO::XsltStyleSheet stylesheet(xsltSheetIns); xsltSheetIns.close(); - Inkscape::URI sourceUri("crystalegg.xml"); + Inkscape::URI sourceUri(xmlpath); Inkscape::IO::UriInputStream xmlIns(sourceUri); printf("######### XSLT Input ############\n"); @@ -122,7 +135,7 @@ bool testGzip() printf("######### Gzip Output ############\n"); Inkscape::URI gzUri("test.gz"); - Inkscape::URI sourceUri("crystalegg.xml"); + Inkscape::URI sourceUri(xmlpath); Inkscape::IO::UriInputStream sourceIns(sourceUri); Inkscape::IO::UriOutputStream gzOuts(gzUri); @@ -174,12 +187,54 @@ bool doTest() return true; } +void path_init(char *path, char *name) +{ + if (strlen(name)>PATH_MAX-strlen(myself)) + { + printf("merging paths would be too long\n"); + exit(1); + } + strncpy(path,myself,PATH_MAX); + char * ptr = strrchr(path,'/'); + if (!ptr) + { + printf("path '%s' is missing any slashes\n",path); + exit(1); + } + strncpy(ptr+1,name,strlen(name)+1); + printf("'%s'\n",path); +} + int main(int argc, char **argv) { + if (!realpath(argv[0],myself)) + { + perror("realpath"); + return 1; + } + path_init(xmlpath,xmlname); + path_init(xslpath,xslname); + + // create temp files somewhere else instead of current dir + // TODO: clean them up too + char * testpath = strdup("/tmp/streamtest-XXXXXX"); + testpath = mkdtemp(testpath); + if (!testpath) + { + perror("mkdtemp"); + return 1; + } + if (chdir(testpath)) + { + perror("chdir"); + return 1; + } + if (!doTest()) { printf("#### Test failed\n"); + return 1; } else { diff -uNrp ../1/src/style-test.cpp src/style-test.cpp --- ../1/src/style-test.cpp 2005-01-08 23:27:43.000000000 -0800 +++ src/style-test.cpp 2005-02-05 09:24:06.000000000 -0800 @@ -412,7 +412,7 @@ test_style() {"writing-mode", "lr-tb", "lr-tb", enum_val, writing_mode_vals, true} }; - char const str0_all_exp[] = "font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;opacity:1.0000000;color:#000000;fill:#000000;fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1.0000000;visibility:visible;display:inline;font-family:Bitstream Vera Sans;letter-spacing:normal;text-anchor:start;writing-mode:lr-tb"; + char const str0_all_exp[] = "font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;opacity:1.0000000;color:#000000;fill:#000000;fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans;letter-spacing:normal;text-anchor:start;writing-mode:lr-tb"; utest_start("style"); UTEST_TEST("sp_style_new, sp_style_write_string") {