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. Signed-off-by: Elliott Sales de Andrade --- tests/testthat/test_layout.fr.R | 2 -- tests/testthat/test_layout.kk.R | 4 +--- tests/testthat/test_sir.R | 6 +----- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/tests/testthat/test_layout.fr.R b/tests/testthat/test_layout.fr.R index f6a7ad2..71b9be4 100644 --- a/tests/testthat/test_layout.fr.R +++ b/tests/testthat/test_layout.fr.R @@ -16,8 +16,6 @@ test_that("", { l <- layout_with_fr(g, niter=500, dim=3, start.temp=20) if (Sys.info()["machine"] %in% c("aarch64", "ppc64", "ppc64le", "s390x")) { expect_that(sum(l), equals(1079, tolerance = 1)) - } else if (Sys.info()["machine"] == "i686") { - expect_that(sum(l), equals(1004.00737470853)) } else { expect_that(sum(l), equals(941.472420651506)) } diff --git a/tests/testthat/test_layout.kk.R b/tests/testthat/test_layout.kk.R index aa189f7..9e10c2c 100644 --- a/tests/testthat/test_layout.kk.R +++ b/tests/testthat/test_layout.kk.R @@ -9,7 +9,7 @@ test_that("Kamada-Kawai layout generator works", { if (Sys.info()["sysname"] == "Darwin") { expect_that(sum(l), equals(-1.13071769106689)) } else if (Sys.info()["sysname"] == "Linux") { - if (Sys.info()["machine"] %in% c("aarch64", "i686", "ppc64", "ppc64le", "s390x")) { + if (Sys.info()["machine"] %in% c("aarch64", "ppc64", "ppc64le", "s390x")) { expect_that(sum(l), equals(0.914809637353466)) } else { expect_that(sum(l), equals(-6.77278645472984e-05)) @@ -32,8 +32,6 @@ test_that("Kamada-Kawai layout generator works", { } else if (Sys.info()["sysname"] == "Linux") { if (Sys.info()["machine"] %in% c("aarch64", "ppc64", "ppc64le", "s390x")) { expect_that(sum(l), equals(1.54, tolerance = 0.01)) - } else if (Sys.info()["machine"] == "i686") { - expect_that(sum(l), equals(0.0631144692360025)) } else { expect_that(sum(l), equals(-1.83036635516248)) } diff --git a/tests/testthat/test_sir.R b/tests/testthat/test_sir.R 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 (Sys.info()["machine"] == "i686") { - expect_that(digest(res), equals("b73a8ad03b832b3543f2f03d07330398")) - } else { - expect_that(digest(res), equals("bc42d0cbe0bb3321e83979c0432f9cea")) - } + expect_that(digest(res), equals("bc42d0cbe0bb3321e83979c0432f9cea")) }) -- 2.17.1