TESTonce & others: 'make check' need to do a strict comparison, including spaces

Currently, TESTonce uses 'diff -w' so it ignores all white space.
We need a strict comparison, else there is no difference between, for example,
'Association Setup' and 'AssociationSetup' => removing  the option '-w'

diff --git a/tests/TESTonce b/tests/TESTonce
index 6eddbd2524daef410ced43e0f1c95fd49bd81ae3..7e55d24a9e9b719992270fa876b5f6f8aabbab2e 100755 (executable)
--- a/tests/TESTonce
+++ b/tests/TESTonce
@@ -13,10 +13,10 @@ $output=$ARGV[2];
 $options=$ARGV[3];
 
 if ($^O eq 'MSWin32') {
 $options=$ARGV[3];
 
 if ($^O eq 'MSWin32') {

-  $r = system "..\\windump -n -r $input $options 2>NUL | tee NEW/$output | diff -w $output - >DIFF/$output.diff";
+  $r = system "..\\windump -n -r $input $options 2>NUL | tee NEW/$output | diff $output - >DIFF/$output.diff";

  }
 else {
  }
 else {

-  $r = system "../tcpdump 2>/dev/null -n -r $input $options | tee NEW/$output | diff -w $output - >DIFF/$output.diff";
+  $r = system "../tcpdump 2>/dev/null -n -r $input $options | tee NEW/$output | diff $output - >DIFF/$output.diff";

 }
 
 if($r == 0) {
 }
 
 if($r == 0) {

diff --git a/tests/forces1vvv.out b/tests/forces1vvv.out
index 32b76937afe5d6af84bb13ab93437a37f581715f..ebd378cebd70d633dcf587a1a0198aaff080bb44 100644 (file)
--- a/tests/forces1vvv.out
+++ b/tests/forces1vvv.out
@@ -13,7 +13,7 @@ IP (tos 0x2,ECT(0), ttl 64, id 4, offset 0, flags [DF], proto SCTP (132), length
           Oper TLV  GetResp(0x9) length 296
            PATH-DATA TLV, length 292 (data encapsulated 288 Bytes)
             Pathdata: Flags 0x0 ID count 1
           Oper TLV  GetResp(0x9) length 296
            PATH-DATA TLV, length 292 (data encapsulated 288 Bytes)
             Pathdata: Flags 0x0 ID count 1

-              ID#01: 2
+            ID#01: 2

               FULLDATA TLV (Length 280 DataLen 276 Bytes)
                [
                0x0000:  0000 0000 0000 0001 0000 0001 0000 0001
               FULLDATA TLV (Length 280 DataLen 276 Bytes)
                [
                0x0000:  0000 0000 0000 0001 0000 0001 0000 0001


@@ -67,7 +67,7 @@ IP (tos 0x0, ttl 46, id 3, offset 0, flags [DF], proto SCTP (132), length 100)
           Oper TLV  Get(0x7) length 16
            PATH-DATA TLV, length 12 (data encapsulated 8 Bytes)
             Pathdata: Flags 0x0 ID count 1
           Oper TLV  Get(0x7) length 16
            PATH-DATA TLV, length 12 (data encapsulated 8 Bytes)
             Pathdata: Flags 0x0 ID count 1

-              ID#01: 1
+            ID#01: 1

 
 
 IP (tos 0x0, ttl 46, id 4, offset 0, flags [DF], proto SCTP (132), length 112)
 
 
 IP (tos 0x0, ttl 46, id 4, offset 0, flags [DF], proto SCTP (132), length 112)


@@ -85,8 +85,8 @@ IP (tos 0x0, ttl 46, id 4, offset 0, flags [DF], proto SCTP (132), length 112)
           Oper TLV  SetProp(0x2) length 28
            PATH-DATA TLV, length 24 (data encapsulated 20 Bytes)
             Pathdata: Flags 0x0 ID count 2
           Oper TLV  SetProp(0x2) length 28
            PATH-DATA TLV, length 24 (data encapsulated 20 Bytes)
             Pathdata: Flags 0x0 ID count 2

-              ID#01: 60
-              ID#02: 1
+            ID#01: 60
+            ID#02: 1

               FULLDATA TLV (Length 8 DataLen 4 Bytes)
                [
                0x0000:  0000 0001
               FULLDATA TLV (Length 8 DataLen 4 Bytes)
                [
                0x0000:  0000 0001


@@ -111,8 +111,8 @@ IP (tos 0x0, ttl 46, id 5, offset 0, flags [DF], proto SCTP (132), length 112)
           Oper TLV  SetProp(0x2) length 28
            PATH-DATA TLV, length 24 (data encapsulated 20 Bytes)
             Pathdata: Flags 0x0 ID count 2
           Oper TLV  SetProp(0x2) length 28
            PATH-DATA TLV, length 24 (data encapsulated 20 Bytes)
             Pathdata: Flags 0x0 ID count 2

-              ID#01: 60
-              ID#02: 2
+            ID#01: 60
+            ID#02: 2

               FULLDATA TLV (Length 8 DataLen 4 Bytes)
                [
                0x0000:  0000 0001
               FULLDATA TLV (Length 8 DataLen 4 Bytes)
                [
                0x0000:  0000 0001


@@ -134,8 +134,8 @@ IP (tos 0x0, ttl 46, id 6, offset 0, flags [DF], proto SCTP (132), length 112)
           Oper TLV  SetProp(0x2) length 28
            PATH-DATA TLV, length 24 (data encapsulated 20 Bytes)
             Pathdata: Flags 0x0 ID count 2
           Oper TLV  SetProp(0x2) length 28
            PATH-DATA TLV, length 24 (data encapsulated 20 Bytes)
             Pathdata: Flags 0x0 ID count 2

-              ID#01: 60
-              ID#02: 3
+            ID#01: 60
+            ID#02: 3

               FULLDATA TLV (Length 8 DataLen 4 Bytes)
                [
                0x0000:  0000 0001
               FULLDATA TLV (Length 8 DataLen 4 Bytes)
                [
                0x0000:  0000 0001


@@ -160,8 +160,8 @@ IP (tos 0x0, ttl 46, id 7, offset 0, flags [DF], proto SCTP (132), length 112)
           Oper TLV  SetProp(0x2) length 28
            PATH-DATA TLV, length 24 (data encapsulated 20 Bytes)
             Pathdata: Flags 0x0 ID count 2
           Oper TLV  SetProp(0x2) length 28
            PATH-DATA TLV, length 24 (data encapsulated 20 Bytes)
             Pathdata: Flags 0x0 ID count 2

-              ID#01: 60
-              ID#02: 1
+            ID#01: 60
+            ID#02: 1

               FULLDATA TLV (Length 8 DataLen 4 Bytes)
                [
                0x0000:  0000 0001
               FULLDATA TLV (Length 8 DataLen 4 Bytes)
                [
                0x0000:  0000 0001

diff --git a/tests/forces1vvvv.out b/tests/forces1vvvv.out
index 6bc4faaa35fececf6933e9b84ec9fb219f927f7a..e418839b2ed04d167b2e8b8ebedd863fb599c20c 100644 (file)
--- a/tests/forces1vvvv.out
+++ b/tests/forces1vvvv.out
@@ -13,7 +13,7 @@ IP (tos 0x2,ECT(0), ttl 64, id 4, offset 0, flags [DF], proto SCTP (132), length
           Oper TLV  GetResp(0x9) length 296
            PATH-DATA TLV, length 292 (data encapsulated 288 Bytes)
             Pathdata: Flags 0x0 ID count 1
           Oper TLV  GetResp(0x9) length 296
            PATH-DATA TLV, length 292 (data encapsulated 288 Bytes)
             Pathdata: Flags 0x0 ID count 1

-              ID#01: 2
+            ID#01: 2

               FULLDATA TLV (Length 280 DataLen 276 Bytes)
                [
                0x0000:  0000 0000 0000 0001 0000 0001 0000 0001
               FULLDATA TLV (Length 280 DataLen 276 Bytes)
                [
                0x0000:  0000 0000 0000 0001 0000 0001 0000 0001


@@ -96,7 +96,7 @@ IP (tos 0x0, ttl 46, id 3, offset 0, flags [DF], proto SCTP (132), length 100)
           Oper TLV  Get(0x7) length 16
            PATH-DATA TLV, length 12 (data encapsulated 8 Bytes)
             Pathdata: Flags 0x0 ID count 1
           Oper TLV  Get(0x7) length 16
            PATH-DATA TLV, length 12 (data encapsulated 8 Bytes)
             Pathdata: Flags 0x0 ID count 1

-              ID#01: 1
+            ID#01: 1

 
          Raw ForCES message
         [
 
          Raw ForCES message
         [


@@ -121,8 +121,8 @@ IP (tos 0x0, ttl 46, id 4, offset 0, flags [DF], proto SCTP (132), length 112)
           Oper TLV  SetProp(0x2) length 28
            PATH-DATA TLV, length 24 (data encapsulated 20 Bytes)
             Pathdata: Flags 0x0 ID count 2
           Oper TLV  SetProp(0x2) length 28
            PATH-DATA TLV, length 24 (data encapsulated 20 Bytes)
             Pathdata: Flags 0x0 ID count 2

-              ID#01: 60
-              ID#02: 1
+            ID#01: 60
+            ID#02: 1

               FULLDATA TLV (Length 8 DataLen 4 Bytes)
                [
                0x0000:  0000 0001
               FULLDATA TLV (Length 8 DataLen 4 Bytes)
                [
                0x0000:  0000 0001


@@ -154,8 +154,8 @@ IP (tos 0x0, ttl 46, id 5, offset 0, flags [DF], proto SCTP (132), length 112)
           Oper TLV  SetProp(0x2) length 28
            PATH-DATA TLV, length 24 (data encapsulated 20 Bytes)
             Pathdata: Flags 0x0 ID count 2
           Oper TLV  SetProp(0x2) length 28
            PATH-DATA TLV, length 24 (data encapsulated 20 Bytes)
             Pathdata: Flags 0x0 ID count 2

-              ID#01: 60
-              ID#02: 2
+            ID#01: 60
+            ID#02: 2

               FULLDATA TLV (Length 8 DataLen 4 Bytes)
                [
                0x0000:  0000 0001
               FULLDATA TLV (Length 8 DataLen 4 Bytes)
                [
                0x0000:  0000 0001


@@ -184,8 +184,8 @@ IP (tos 0x0, ttl 46, id 6, offset 0, flags [DF], proto SCTP (132), length 112)
           Oper TLV  SetProp(0x2) length 28
            PATH-DATA TLV, length 24 (data encapsulated 20 Bytes)
             Pathdata: Flags 0x0 ID count 2
           Oper TLV  SetProp(0x2) length 28
            PATH-DATA TLV, length 24 (data encapsulated 20 Bytes)
             Pathdata: Flags 0x0 ID count 2

-              ID#01: 60
-              ID#02: 3
+            ID#01: 60
+            ID#02: 3

               FULLDATA TLV (Length 8 DataLen 4 Bytes)
                [
                0x0000:  0000 0001
               FULLDATA TLV (Length 8 DataLen 4 Bytes)
                [
                0x0000:  0000 0001


@@ -217,8 +217,8 @@ IP (tos 0x0, ttl 46, id 7, offset 0, flags [DF], proto SCTP (132), length 112)
           Oper TLV  SetProp(0x2) length 28
            PATH-DATA TLV, length 24 (data encapsulated 20 Bytes)
             Pathdata: Flags 0x0 ID count 2
           Oper TLV  SetProp(0x2) length 28
            PATH-DATA TLV, length 24 (data encapsulated 20 Bytes)
             Pathdata: Flags 0x0 ID count 2

-              ID#01: 60
-              ID#02: 1
+            ID#01: 60
+            ID#02: 1

               FULLDATA TLV (Length 8 DataLen 4 Bytes)
                [
                0x0000:  0000 0001
               FULLDATA TLV (Length 8 DataLen 4 Bytes)
                [
                0x0000:  0000 0001

diff --git a/tests/of10_p3295-vv.out b/tests/of10_p3295-vv.out
index 824595d1ac9345d6a9461e94c16a08a8fa4c7914..521bdd4e5c05a9f8f7d43e0cdf5390fa908e6a13 100644 (file)
--- a/tests/of10_p3295-vv.out
+++ b/tests/of10_p3295-vv.out
@@ -730,8 +730,8 @@ IP (tos 0x0, ttl 64, id 55529, offset 0, flags [DF], proto TCP (6), length 128)
        version 1.0, type STATS_REPLY, length 76, xid 0x0000001f
         type TABLE, flags 0x0000
         table_id 0, name 'classifier'
        version 1.0, type STATS_REPLY, length 76, xid 0x0000001f
         type TABLE, flags 0x0000
         table_id 0, name 'classifier'

-        wildcards 0x003fffff (IN_PORT, DL_VLAN, DL_SRC, DL_DST, DL_TYPE, NW_PROTO, TP_SRC, TP_DST, DL_VLAN_PCP, NW_TOS)
-        max_entries 1000000, active_count 26, lookup_count 1158498983736653433, matched_count 1158498983736653433
+         wildcards 0x003fffff (IN_PORT, DL_VLAN, DL_SRC, DL_DST, DL_TYPE, NW_PROTO, TP_SRC, TP_DST, DL_VLAN_PCP, NW_TOS)
+         max_entries 1000000, active_count 26, lookup_count 1158498983736653433, matched_count 1158498983736653433

 IP (tos 0x0, ttl 64, id 794, offset 0, flags [DF], proto TCP (6), length 52)
     10.0.0.20.6633 > 10.0.0.50.35256: Flags [.], cksum 0x146c (incorrect -> 0x7eb8), seq 2237, ack 7057, win 203, options [nop,nop,TS val 220958721 ecr 194889063], length 0
 IP (tos 0x0, ttl 64, id 55530, offset 0, flags [DF], proto TCP (6), length 2948)
 IP (tos 0x0, ttl 64, id 794, offset 0, flags [DF], proto TCP (6), length 52)
     10.0.0.20.6633 > 10.0.0.50.35256: Flags [.], cksum 0x146c (incorrect -> 0x7eb8), seq 2237, ack 7057, win 203, options [nop,nop,TS val 220958721 ecr 194889063], length 0
 IP (tos 0x0, ttl 64, id 55530, offset 0, flags [DF], proto TCP (6), length 2948)