aboutsummaryrefslogtreecommitdiffstats
path: root/tests/tdef
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2020-11-15 17:58:10 +0100
committerPau Espin Pedrol <pespin@sysmocom.de>2020-11-15 18:01:45 +0100
commit2299cb52a3619ea9bec49b8b231fa029fcadd76b (patch)
tree4f64f7965603a0125cf6d65a86c50b87da524225 /tests/tdef
parent4fe8a7598a92b7fc9c37749799e1d35bed7eed56 (diff)
Revert "tests: Fix tdef_test on 32bit platforms"
This was not the issue, see next commit fixing the correct issue. This reverts commit af10e48c1bf7ec40678b9a4387fc50ab0846b467. Change-Id: Ifa1057ac55fcacdeb55ecdaac1ac3ddcca7d6d65
Diffstat (limited to 'tests/tdef')
-rw-r--r--tests/tdef/tdef_test.c2
-rw-r--r--tests/tdef/tdef_test.ok10
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/tdef/tdef_test.c b/tests/tdef/tdef_test.c
index 17fd4e5a..d874231a 100644
--- a/tests/tdef/tdef_test.c
+++ b/tests/tdef/tdef_test.c
@@ -48,7 +48,7 @@ static struct osmo_tdef tdefs[] = {
/* test conversions */
{ .T=1000, .default_val=2*1000, .unit=OSMO_TDEF_MS, .desc="two seconds from ms" },
- { .T=1001, .default_val=30*1000, .unit=OSMO_TDEF_MS, .desc="half minute from ms" },
+ { .T=1001, .default_val=60*1000, .unit=OSMO_TDEF_MS, .desc="one minute from ms" },
{ .T=1004, .default_val=1, .unit=OSMO_TDEF_MS, .desc="one ms" },
{ .T=1005, .default_val=0, .unit=OSMO_TDEF_MS, .desc="zero ms" },
{ .T=1006, .default_val=0, .unit=OSMO_TDEF_S, .desc="zero s" },
diff --git a/tests/tdef/tdef_test.ok b/tests/tdef/tdef_test.ok
index 4bdd3d0b..1770968d 100644
--- a/tests/tdef/tdef_test.ok
+++ b/tests/tdef/tdef_test.ok
@@ -54,12 +54,12 @@ osmo_tdef_get(1000, ms) = 2000
osmo_tdef_get(1000, m) = 1
osmo_tdef_get(1000, custom-unit) = 2000
osmo_tdef_get(1000, us) = 2000000
-T1001=30000ms
-osmo_tdef_get(1001, s) = 30
-osmo_tdef_get(1001, ms) = 30000
+T1001=60000ms
+osmo_tdef_get(1001, s) = 60
+osmo_tdef_get(1001, ms) = 60000
osmo_tdef_get(1001, m) = 1
-osmo_tdef_get(1001, custom-unit) = 30000
-osmo_tdef_get(1001, us) = 30000000
+osmo_tdef_get(1001, custom-unit) = 60000
+osmo_tdef_get(1001, us) = 60000000
T1004=1ms
osmo_tdef_get(1004, s) = 1
osmo_tdef_get(1004, ms) = 1