Change in libosmocore[master]: tests: Fix tdef_test on 32bit platforms

2020-11-15 Thread laforge 
laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/libosmocore/+/21162 )

Change subject: tests: Fix tdef_test on 32bit platforms
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21162
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ic0d009f00a69cee59f2d3fc0b40ecdc97d81c75c
Gerrit-Change-Number: 21162
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Comment-Date: Sun, 15 Nov 2020 22:34:44 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in libosmocore[master]: tests: Fix tdef_test on 32bit platforms

2020-11-15 Thread laforge 
laforge has submitted this change. ( 
https://gerrit.osmocom.org/c/libosmocore/+/21162 )

Change subject: tests: Fix tdef_test on 32bit platforms
..

tests: Fix tdef_test on 32bit platforms

100 minutes = 60 microseconds was too big to be stored in an
unsigned long in a 32bit platform, making the test print 4294967295
instead. Let's set a smaller value to have the test happy on 32 bits.

Change-Id: Ic0d009f00a69cee59f2d3fc0b40ecdc97d81c75c
---
M tests/tdef/tdef_test.c
M tests/tdef/tdef_test.ok
2 files changed, 9 insertions(+), 9 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/tests/tdef/tdef_test.c b/tests/tdef/tdef_test.c
index d874231..ede3082 100644
--- a/tests/tdef/tdef_test.c
+++ b/tests/tdef/tdef_test.c
@@ -38,7 +38,7 @@
 static struct osmo_tdef tdefs[] = {
{ .T=1, .default_val=100, .desc="100s" },
{ .T=2, .default_val=100, .unit=OSMO_TDEF_MS, .desc="100ms" },
-   { .T=3, .default_val=100, .unit=OSMO_TDEF_M, .desc="100m" },
+   { .T=3, .default_val=50, .unit=OSMO_TDEF_M, .desc="50m" },
{ .T=4, .default_val=100, .unit=OSMO_TDEF_CUSTOM, .desc="100 potatoes" 
},

{ .T=7, .default_val=50, .desc="Water Boiling Timeout", .min_val=20, 
.max_val=800 },  // default is .unit=OSMO_TDEF_S == 0
diff --git a/tests/tdef/tdef_test.ok b/tests/tdef/tdef_test.ok
index 1770968..4c97dab 100644
--- a/tests/tdef/tdef_test.ok
+++ b/tests/tdef/tdef_test.ok
@@ -12,12 +12,12 @@
 osmo_tdef_get(2, m)= 1
 osmo_tdef_get(2, custom-unit)  = 100
 osmo_tdef_get(2, us)   = 10
-T3=100m
-osmo_tdef_get(3, s)= 6000
-osmo_tdef_get(3, ms)   = 600
-osmo_tdef_get(3, m)= 100
-osmo_tdef_get(3, custom-unit)  = 100
-osmo_tdef_get(3, us)   = 60
+T3=50m
+osmo_tdef_get(3, s)= 3000
+osmo_tdef_get(3, ms)   = 300
+osmo_tdef_get(3, m)= 50
+osmo_tdef_get(3, custom-unit)  = 50
+osmo_tdef_get(3, us)   = 30
 T4=100custom-unit
 osmo_tdef_get(4, s)= 100
 osmo_tdef_get(4, ms)   = 100
@@ -154,7 +154,7 @@
 state=A T=0, no timeout
  --> A (configured as T1 100 s) rc=0;  state=A T=1, 100.00 s remaining
  --> B (configured as T2 100 ms) rc=0; state=B T=2, 1.00 s remaining
- --> C (configured as T3 100 m) rc=0;  state=C T=3, 6000.00 s remaining
+ --> C (configured as T3 50 m) rc=0;   state=C T=3, 3000.00 s remaining
  --> D (configured as T4 100 custom-unit) rc=0;state=D T=4, 100.00 
s remaining
  --> G (configured as T7 50 s) rc=0;   state=G T=7, 50.00 s remaining
  --> H (configured as T8 300 s) rc=0;  state=H T=8, 300.00 s remaining
@@ -183,5 +183,5 @@
 - test disallowed transition:
  --> Z (no timer configured for this state) rc=0;  state=Z T=0, no timeout
  --> B (configured as T2 100 ms) rc=-1;state=Z T=0, no timeout
- --> C (configured as T3 100 m) rc=-1; state=Z T=0, no timeout
+ --> C (configured as T3 50 m) rc=-1;  state=Z T=0, no timeout
  --> D (configured as T4 100 custom-unit) rc=-1;   state=Z T=0, no timeout

--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21162
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ic0d009f00a69cee59f2d3fc0b40ecdc97d81c75c
Gerrit-Change-Number: 21162
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-MessageType: merged

Change in libosmocore[master]: tests: Fix tdef_test on 32bit platforms

2020-11-15 Thread pespin 
pespin has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/libosmocore/+/21162 )


Change subject: tests: Fix tdef_test on 32bit platforms
..

tests: Fix tdef_test on 32bit platforms

100 minutes = 60 microseconds was too big to be stored in an
unsigned long in a 32bit platform, making the test print 4294967295
instead. Let's set a smaller value to have the test happy on 32 bits.

Change-Id: Ic0d009f00a69cee59f2d3fc0b40ecdc97d81c75c
---
M tests/tdef/tdef_test.c
M tests/tdef/tdef_test.ok
2 files changed, 9 insertions(+), 9 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/62/21162/1

diff --git a/tests/tdef/tdef_test.c b/tests/tdef/tdef_test.c
index d874231..ede3082 100644
--- a/tests/tdef/tdef_test.c
+++ b/tests/tdef/tdef_test.c
@@ -38,7 +38,7 @@
 static struct osmo_tdef tdefs[] = {
{ .T=1, .default_val=100, .desc="100s" },
{ .T=2, .default_val=100, .unit=OSMO_TDEF_MS, .desc="100ms" },
-   { .T=3, .default_val=100, .unit=OSMO_TDEF_M, .desc="100m" },
+   { .T=3, .default_val=50, .unit=OSMO_TDEF_M, .desc="50m" },
{ .T=4, .default_val=100, .unit=OSMO_TDEF_CUSTOM, .desc="100 potatoes" 
},

{ .T=7, .default_val=50, .desc="Water Boiling Timeout", .min_val=20, 
.max_val=800 },  // default is .unit=OSMO_TDEF_S == 0
diff --git a/tests/tdef/tdef_test.ok b/tests/tdef/tdef_test.ok
index 1770968..4c97dab 100644
--- a/tests/tdef/tdef_test.ok
+++ b/tests/tdef/tdef_test.ok
@@ -12,12 +12,12 @@
 osmo_tdef_get(2, m)= 1
 osmo_tdef_get(2, custom-unit)  = 100
 osmo_tdef_get(2, us)   = 10
-T3=100m
-osmo_tdef_get(3, s)= 6000
-osmo_tdef_get(3, ms)   = 600
-osmo_tdef_get(3, m)= 100
-osmo_tdef_get(3, custom-unit)  = 100
-osmo_tdef_get(3, us)   = 60
+T3=50m
+osmo_tdef_get(3, s)= 3000
+osmo_tdef_get(3, ms)   = 300
+osmo_tdef_get(3, m)= 50
+osmo_tdef_get(3, custom-unit)  = 50
+osmo_tdef_get(3, us)   = 30
 T4=100custom-unit
 osmo_tdef_get(4, s)= 100
 osmo_tdef_get(4, ms)   = 100
@@ -154,7 +154,7 @@
 state=A T=0, no timeout
  --> A (configured as T1 100 s) rc=0;  state=A T=1, 100.00 s remaining
  --> B (configured as T2 100 ms) rc=0; state=B T=2, 1.00 s remaining
- --> C (configured as T3 100 m) rc=0;  state=C T=3, 6000.00 s remaining
+ --> C (configured as T3 50 m) rc=0;   state=C T=3, 3000.00 s remaining
  --> D (configured as T4 100 custom-unit) rc=0;state=D T=4, 100.00 
s remaining
  --> G (configured as T7 50 s) rc=0;   state=G T=7, 50.00 s remaining
  --> H (configured as T8 300 s) rc=0;  state=H T=8, 300.00 s remaining
@@ -183,5 +183,5 @@
 - test disallowed transition:
  --> Z (no timer configured for this state) rc=0;  state=Z T=0, no timeout
  --> B (configured as T2 100 ms) rc=-1;state=Z T=0, no timeout
- --> C (configured as T3 100 m) rc=-1; state=Z T=0, no timeout
+ --> C (configured as T3 50 m) rc=-1;  state=Z T=0, no timeout
  --> D (configured as T4 100 custom-unit) rc=-1;   state=Z T=0, no timeout

--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21162
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ic0d009f00a69cee59f2d3fc0b40ecdc97d81c75c
Gerrit-Change-Number: 21162
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-MessageType: newchange

Change in libosmocore[master]: tests: Fix tdef_test on 32bit platforms

2020-11-12 Thread laforge 
laforge has submitted this change. ( 
https://gerrit.osmocom.org/c/libosmocore/+/21121 )

Change subject: tests: Fix tdef_test on 32bit platforms
..

tests: Fix tdef_test on 32bit platforms

60 seconds = 60 microseconds was too big to be stored in an
unsigned long in a 32bit platform, making the test print 4294967295
instead. Let's set a smaller value to have the test happy on 32 bits.

Change-Id: I97d53f6b7b410cef4b3f3fbe3162626fcdd7b05a
---
M tests/tdef/tdef_test.c
M tests/tdef/tdef_test.ok
2 files changed, 6 insertions(+), 6 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/tests/tdef/tdef_test.c b/tests/tdef/tdef_test.c
index d874231..17fd4e5 100644
--- a/tests/tdef/tdef_test.c
+++ b/tests/tdef/tdef_test.c
@@ -48,7 +48,7 @@

/* test conversions */
{ .T=1000, .default_val=2*1000, .unit=OSMO_TDEF_MS, .desc="two seconds 
from ms" },
-   { .T=1001, .default_val=60*1000, .unit=OSMO_TDEF_MS, .desc="one minute 
from ms" },
+   { .T=1001, .default_val=30*1000, .unit=OSMO_TDEF_MS, .desc="half 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 1770968..4bdd3d0 100644
--- a/tests/tdef/tdef_test.ok
+++ b/tests/tdef/tdef_test.ok
@@ -54,12 +54,12 @@
 osmo_tdef_get(1000, m) = 1
 osmo_tdef_get(1000, custom-unit)   = 2000
 osmo_tdef_get(1000, us)= 200
-T1001=6ms
-osmo_tdef_get(1001, s) = 60
-osmo_tdef_get(1001, ms)= 6
+T1001=3ms
+osmo_tdef_get(1001, s) = 30
+osmo_tdef_get(1001, ms)= 3
 osmo_tdef_get(1001, m) = 1
-osmo_tdef_get(1001, custom-unit)   = 6
-osmo_tdef_get(1001, us)= 6000
+osmo_tdef_get(1001, custom-unit)   = 3
+osmo_tdef_get(1001, us)= 3000
 T1004=1ms
 osmo_tdef_get(1004, s) = 1
 osmo_tdef_get(1004, ms)= 1

--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21121
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I97d53f6b7b410cef4b3f3fbe3162626fcdd7b05a
Gerrit-Change-Number: 21121
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-MessageType: merged

Change in libosmocore[master]: tests: Fix tdef_test on 32bit platforms

2020-11-12 Thread laforge 
laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/libosmocore/+/21121 )

Change subject: tests: Fix tdef_test on 32bit platforms
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21121
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I97d53f6b7b410cef4b3f3fbe3162626fcdd7b05a
Gerrit-Change-Number: 21121
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Comment-Date: Thu, 12 Nov 2020 15:52:33 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in libosmocore[master]: tests: Fix tdef_test on 32bit platforms

2020-11-12 Thread pespin 
pespin has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/libosmocore/+/21121 )


Change subject: tests: Fix tdef_test on 32bit platforms
..

tests: Fix tdef_test on 32bit platforms

60 seconds = 60 microseconds was too big to be stored in an
unsigned long in a 32bit platform, making the test print 4294967295
instead. Let's set a smaller value to have the test happy on 32 bits.

Change-Id: I97d53f6b7b410cef4b3f3fbe3162626fcdd7b05a
---
M tests/tdef/tdef_test.c
M tests/tdef/tdef_test.ok
2 files changed, 6 insertions(+), 6 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/21/21121/1

diff --git a/tests/tdef/tdef_test.c b/tests/tdef/tdef_test.c
index d874231..17fd4e5 100644
--- a/tests/tdef/tdef_test.c
+++ b/tests/tdef/tdef_test.c
@@ -48,7 +48,7 @@

/* test conversions */
{ .T=1000, .default_val=2*1000, .unit=OSMO_TDEF_MS, .desc="two seconds 
from ms" },
-   { .T=1001, .default_val=60*1000, .unit=OSMO_TDEF_MS, .desc="one minute 
from ms" },
+   { .T=1001, .default_val=30*1000, .unit=OSMO_TDEF_MS, .desc="half 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 1770968..4bdd3d0 100644
--- a/tests/tdef/tdef_test.ok
+++ b/tests/tdef/tdef_test.ok
@@ -54,12 +54,12 @@
 osmo_tdef_get(1000, m) = 1
 osmo_tdef_get(1000, custom-unit)   = 2000
 osmo_tdef_get(1000, us)= 200
-T1001=6ms
-osmo_tdef_get(1001, s) = 60
-osmo_tdef_get(1001, ms)= 6
+T1001=3ms
+osmo_tdef_get(1001, s) = 30
+osmo_tdef_get(1001, ms)= 3
 osmo_tdef_get(1001, m) = 1
-osmo_tdef_get(1001, custom-unit)   = 6
-osmo_tdef_get(1001, us)= 6000
+osmo_tdef_get(1001, custom-unit)   = 3
+osmo_tdef_get(1001, us)= 3000
 T1004=1ms
 osmo_tdef_get(1004, s) = 1
 osmo_tdef_get(1004, ms)= 1

--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21121
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I97d53f6b7b410cef4b3f3fbe3162626fcdd7b05a
Gerrit-Change-Number: 21121
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-MessageType: newchange