Merge pull request #4188 from richardkchapman/regression-niggles

HPCC-9069 Spurious minor regression suite differences

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>

testing/ecl/key/assert.xml

@@ -1,19 +1,19 @@
-<Error><source>user</source><line>27</line><code>100000</code><message>Assert (1 = 2) failed [val1 = 2]</message></Error>
-<Error><source>user</source><line>28</line><code>100000</code><message>Abc2</message></Error>
-<Error><source>user</source><line>29</line><code>100000</code><message>Assert (1 = 2) failed [1 = val4]</message></Error>
-<Error><source>user</source><line>30</line><code>100000</code><message>Abc3</message></Error>
-<Error><source>user</source><line>37</line><code>100000</code><message>Assert (1 = 2) failed [val1 = 2]</message></Error>
-<Error><source>user</source><line>38</line><code>100000</code><message>Abc5</message></Error>
-<Error><source>user</source><line>39</line><code>100000</code><message>Assert (1 = 2) failed [val1 = val4]</message></Error>
-<Error><source>user</source><line>40</line><code>100000</code><message>Abc6</message></Error>
-<Error><source>user</source><line>35</line><code>100000</code><message>Assert (2 = 1) failed [val1 = 1]</message></Error>
-<Error><source>user</source><line>36</line><code>100000</code><message>Abc4</message></Error>
-<Error><source>user</source><line>47</line><code>100000</code><message>Assert (1 = 2) failed [val1 = 2]</message></Error>
-<Error><source>user</source><line>48</line><code>100000</code><message>Abc8</message></Error>
-<Error><source>user</source><line>49</line><code>100000</code><message>Assert (1 = 2) failed [val1 = val4]</message></Error>
-<Error><source>user</source><line>50</line><code>100000</code><message>Abc9</message></Error>
-<Error><source>user</source><line>45</line><code>100000</code><message>Assert (2 = 1) failed [val1 = 1]</message></Error>
-<Error><source>user</source><line>46</line><code>100000</code><message>Abc7</message></Error>
+<Error><source>user</source><line>26</line><code>100000</code><message>Assert (1 = 2) failed [val1 = 2]</message></Error>
+<Error><source>user</source><line>27</line><code>100000</code><message>Abc2</message></Error>
+<Error><source>user</source><line>28</line><code>100000</code><message>Assert (1 = 2) failed [1 = val4]</message></Error>
+<Error><source>user</source><line>29</line><code>100000</code><message>Abc3</message></Error>
+<Error><source>user</source><line>36</line><code>100000</code><message>Assert (1 = 2) failed [val1 = 2]</message></Error>
+<Error><source>user</source><line>37</line><code>100000</code><message>Abc5</message></Error>
+<Error><source>user</source><line>38</line><code>100000</code><message>Assert (1 = 2) failed [val1 = val4]</message></Error>
+<Error><source>user</source><line>39</line><code>100000</code><message>Abc6</message></Error>
+<Error><source>user</source><line>34</line><code>100000</code><message>Assert (2 = 1) failed [val1 = 1]</message></Error>
+<Error><source>user</source><line>35</line><code>100000</code><message>Abc4</message></Error>
+<Error><source>user</source><line>46</line><code>100000</code><message>Assert (1 = 2) failed [val1 = 2]</message></Error>
+<Error><source>user</source><line>47</line><code>100000</code><message>Abc8</message></Error>
+<Error><source>user</source><line>48</line><code>100000</code><message>Assert (1 = 2) failed [val1 = val4]</message></Error>
+<Error><source>user</source><line>49</line><code>100000</code><message>Abc9</message></Error>
+<Error><source>user</source><line>44</line><code>100000</code><message>Assert (2 = 1) failed [val1 = 1]</message></Error>
+<Error><source>user</source><line>45</line><code>100000</code><message>Abc7</message></Error>
 <Dataset name='Result 1'>
  <Row><val1>1</val1></Row>
  <Row><val1>2</val1></Row>

testing/ecl/key/dict_index.xml

@@ -1,3 +1,5 @@
+<Dataset name='Result 1'>
+</Dataset>
 <Dataset name='Result 2'>
  <Row><Result_2>4</Result_2></Row>
 </Dataset>
@@ -5,7 +7,7 @@
  <Row><a>1</a><b>2</b><c><Row><c1>f</c1><c2>F</c2></Row><Row><c1>e</c1><c2>E</c2></Row><Row><c1>d</c1><c2>D</c2></Row><Row><c1>3</c1><c2>4</c2></Row><Row><c1>b</c1><c2>B</c2></Row><Row><c1>a</c1><c2>A</c2></Row><Row><c1>c</c1><c2>C</c2></Row></c><d>5</d></Row>
 </Dataset>
 <Dataset name='Result 4'>
- <Row><a> </a><b> </b><c/><d> </d></Row>
+ <Row><a> </a><b> </b><c></c><d> </d></Row>
 </Dataset>
 <Dataset name='Result 5'>
  <Row><a>1</a><b>2</b><c><Row><c1>f</c1><c2>F</c2></Row><Row><c1>e</c1><c2>E</c2></Row><Row><c1>d</c1><c2>D</c2></Row><Row><c1>3</c1><c2>4</c2></Row><Row><c1>b</c1><c2>B</c2></Row><Row><c1>a</c1><c2>A</c2></Row><Row><c1>c</c1><c2>C</c2></Row></c><d>5</d></Row>

testing/ecl/roxie/key/dict_index.xml

@@ -0,0 +1,12 @@
+<Dataset name='Result 2'>
+ <Row><Result_2>4</Result_2></Row>
+</Dataset>
+<Dataset name='Result 3'>
+ <Row><a>1</a><b>2</b><c><Row><c1>f</c1><c2>F</c2></Row><Row><c1>e</c1><c2>E</c2></Row><Row><c1>d</c1><c2>D</c2></Row><Row><c1>3</c1><c2>4</c2></Row><Row><c1>b</c1><c2>B</c2></Row><Row><c1>a</c1><c2>A</c2></Row><Row><c1>c</c1><c2>C</c2></Row></c><d>5</d></Row>
+</Dataset>
+<Dataset name='Result 4'>
+ <Row><a> </a><b> </b><c/><d> </d></Row>
+</Dataset>
+<Dataset name='Result 5'>
+ <Row><a>1</a><b>2</b><c><Row><c1>f</c1><c2>F</c2></Row><Row><c1>e</c1><c2>E</c2></Row><Row><c1>d</c1><c2>D</c2></Row><Row><c1>3</c1><c2>4</c2></Row><Row><c1>b</c1><c2>B</c2></Row><Row><c1>a</c1><c2>A</c2></Row><Row><c1>c</c1><c2>C</c2></Row></c><d>5</d></Row>
+</Dataset>