File: 0011-test-compilation-fix.patch

package info (click to toggle)
flightgear 1%3A2020.3.16%2Bdfsg-1%2Bdeb12u1
  • links: PTS, VCS
  • area: main
  • in suites: bookworm
  • size: 50,944 kB
  • sloc: cpp: 245,473; ansic: 181,318; sh: 13,686; perl: 4,475; python: 3,139; xml: 899; asm: 642; makefile: 349; java: 314
file content (28 lines) | stat: -rw-r--r-- 1,250 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
From: Markus Wanner <markus@bluegap.ch>
Date: Mon, 28 Dec 2020 09:42:58 +0100
Subject: Revert test_gps.cxx to the last known working version

Revert all changes to test_gps.cxx between 2020.5.4 and 2020.5.5 due
to the missing method pointAlongRouteNorm.  This patch should be
removed again once upstream fixes this.
---
 test_suite/unit_tests/Instrumentation/test_gps.cxx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test_suite/unit_tests/Instrumentation/test_gps.cxx b/test_suite/unit_tests/Instrumentation/test_gps.cxx
index 6507084..0f99f10 100644
--- a/test_suite/unit_tests/Instrumentation/test_gps.cxx
+++ b/test_suite/unit_tests/Instrumentation/test_gps.cxx
@@ -1600,9 +1600,10 @@ void GPSTests::testCourseLegIntermediateWaypoint()
 
     SGGeod decelPos = fp->pointAlongRoute(2, -15.0);
     fp->insertWayptAtIndex(new BasicWaypt(decelPos, "DECEL", fp), 2);
-    fp->setCurrentIndex(2); // DECEL
+    fp->setCurrentIndex(3); // BLACA
 
-    SGGeod initPos = fp->pointAlongRouteNorm(1, 0.1);
+    // position halfway between EGAA and EGPF
+    SGGeod initPos = fp->pointAlongRoute(2, -5);
     FGTestApi::setPositionAndStabilise(initPos);
 
     auto gpsNode = globals->get_props()->getNode("instrumentation/gps");