diff --git a/0004-Increase-tolerances-to-work-on-all-arches.patch b/0004-Increase-tolerances-to-work-on-all-arches.patch index 74cacbd..bc5ea33 100644 --- a/0004-Increase-tolerances-to-work-on-all-arches.patch +++ b/0004-Increase-tolerances-to-work-on-all-arches.patch @@ -1,4 +1,4 @@ -From e302272a0798b439b4b1f5d782c8876791d819de Mon Sep 17 00:00:00 2001 +From c79795c3d83340e7aa22b02821b435dcf4e376b1 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 24 Jul 2018 01:35:02 -0400 Subject: [PATCH 4/5] Increase tolerances to work on all arches. @@ -7,7 +7,8 @@ Signed-off-by: Elliott Sales de Andrade --- tests/testthat/test_layout.fr.R | 11 ++++------- tests/testthat/test_layout.kk.R | 34 ++++++++++++++++----------------- - 2 files changed, 20 insertions(+), 25 deletions(-) + tests/testthat/test_sir.R | 2 +- + 3 files changed, 21 insertions(+), 26 deletions(-) diff --git a/tests/testthat/test_layout.fr.R b/tests/testthat/test_layout.fr.R index 4b3318a..f6a7ad2 100644 @@ -95,6 +96,19 @@ index 5b94e46..aa189f7 100644 } }) +diff --git a/tests/testthat/test_sir.R b/tests/testthat/test_sir.R +index bff59c2..a64d873 100644 +--- a/tests/testthat/test_sir.R ++++ b/tests/testthat/test_sir.R +@@ -11,7 +11,7 @@ test_that("SIR works", { + + g <- sample_gnm(50, 50) + res <- sir(g, beta=5, gamma=1, no.sim=10) +- if (.Machine$sizeof.pointer == 4) { ++ if (Sys.info()["machine"] == "i686") { + expect_that(digest(res), equals("b73a8ad03b832b3543f2f03d07330398")) + } else { + expect_that(digest(res), equals("bc42d0cbe0bb3321e83979c0432f9cea")) -- 2.17.1 diff --git a/0005-Update-test-results-for-Rawhide.patch b/0005-Update-test-results-for-Rawhide.patch index 3940bb5..5ce7272 100644 --- a/0005-Update-test-results-for-Rawhide.patch +++ b/0005-Update-test-results-for-Rawhide.patch @@ -1,4 +1,4 @@ -From 84e169efe2f76c281b1b055183a38ddd1133ccba Mon Sep 17 00:00:00 2001 +From 2125f0860aba9fbf7dd55ba113dd6d188511a141 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 24 Jul 2018 19:53:52 -0400 Subject: [PATCH 5/5] Update test results for Rawhide. @@ -46,14 +46,14 @@ index aa189f7..9e10c2c 100644 expect_that(sum(l), equals(-1.83036635516248)) } diff --git a/tests/testthat/test_sir.R b/tests/testthat/test_sir.R -index bff59c2..2059270 100644 +index a64d873..2059270 100644 --- a/tests/testthat/test_sir.R +++ b/tests/testthat/test_sir.R @@ -11,10 +11,6 @@ test_that("SIR works", { g <- sample_gnm(50, 50) res <- sir(g, beta=5, gamma=1, no.sim=10) -- if (.Machine$sizeof.pointer == 4) { +- if (Sys.info()["machine"] == "i686") { - expect_that(digest(res), equals("b73a8ad03b832b3543f2f03d07330398")) - } else { - expect_that(digest(res), equals("bc42d0cbe0bb3321e83979c0432f9cea"))