← Back to branch summary

~l3on/ubuntu/precise/rkward/rebuild1

« back to all changes in this revision

Viewing changes to tests/test_framework.R

  • Committer: Bazaar Package Importer
  • Author(s): Thomas Friedrichsmeier
  • Date: 2010-10-04 14:30:00 UTC
  • mfrom: (12.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20101004143000-qey73molmxxwy4w6
Tags: 0.5.4-1
* new upstream release
* bump standards version to 3.9.1 (no changes needed)
* no more need to remove svncopy.sh-script in rules

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_framework.R
85
85
                if (!file.exists (standard_file)) return ("match (empty)")
86
86
        }
87
87
 
88
 
        output.diff <- system(paste("diff", shQuote(file), shQuote(standard_file), "--strip-trailing-cr", "--new-file"), intern=TRUE)
 
88
        output.diff <- suppressWarnings (system(paste("diff", shQuote(file), shQuote(standard_file), "--strip-trailing-cr", "--new-file"), intern=TRUE))
89
89
        if (!length (output.diff)) return ("match")
90
90
        if ((length (output.diff) == 1) && (!nzchar (output.diff))) return ("match")
91
91
 
278
278
        .rk.rerun.plugin.link <<- .rk.make.hr <<- function (...) { list (...) }
279
279
 
280
280
        # This should make the output of rk.graph.on() fixed
281
 
        rk.get.tempfile.name <<- function (prefix, extension) paste (prefix, extension, sep="")
 
281
        rk.get.tempfile.name <<- function (prefix="image", extension=".jpg") paste (prefix, extension, sep="")
282
282
        options (rk.graphics.type="PNG", rk.graphics.width=480, rk.graphics.height=480)
283
283
 
284
284
        # HACK: Override date, so we don't get a difference for each call of rk.header ()