Merge branch 'topic/vadim/win' into 'master'

Fix testing on Windows

Closes #244

See merge request eng/ide/VSS!331

Makefile

@@ -79,7 +79,7 @@ check_text:
 	.objs/tests/test_line_iterators
 	.objs/tests/test_stream_element_vector
 	.objs/tests/test_text_streams
-	.objs/tests/test_file_text_streams testsuite/stream/test_file_text_stream/vss.197.in.txt /tmp/vss.197.out.txt && diff -u /tmp/vss.197.out.txt testsuite/stream/test_file_text_stream/vss.197.out.txt
+	.objs/tests/test_file_text_streams testsuite/stream/test_file_text_stream/vss.197.in.txt /tmp/vss.197.out.txt && diff -u --strip-trailing-cr /tmp/vss.197.out.txt testsuite/stream/test_file_text_stream/vss.197.out.txt
 	.objs/tests/test_string_append
 	.objs/tests/test_string_compare
 	.objs/tests/test_string_conversions
@@ -97,7 +97,7 @@ check_text:
 	.objs/tests/test_word_iterators data/ucd
 	.objs/tests/test_standard_paths
 ifeq ($(OS),Windows_NT)
-	cmd.exe /c "testsuite\\run_test_application_arguments.cmd"
+	cmd.exe \/c "testsuite\\run_test_application_arguments.bat"
 else
 	.objs/tests/test_application_arguments hello привет გამარჯობა 👋
 endif

data/.gitignore

@@ -1,3 +1,4 @@
 emoji
+json5-tests
 parse-number-fxx-test-data
 ucd

testsuite/json/test_json_decimal_to_number.adb

@@ -1,5 +1,5 @@
 --
---  Copyright (C) 2022, AdaCore
+--  Copyright (C) 2022-2024, AdaCore
 --
 --  SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 --
@@ -53,6 +53,13 @@ procedure Test_JSON_Decimal_To_Number is
       Last      : Natural;
 
    begin
+      if File_Name = "/dev/null" then
+         --  There is no /dev/null file on Windows, so don't attempt to open it
+         --  to avoid unexpected test failure on Windows.
+
+         return;
+      end if;
+
       Ada.Text_IO.Open (File, Ada.Text_IO.In_File, File_Name);
 
       while not Ada.Text_IO.End_Of_File (File) loop

testsuite/run_test_application_arguments.cmd → testsuite/run_test_application_arguments.bat

@@ -1,4 +1,5 @@
-::  Run test driver executable and pass necessary arguments
-::  It is workaround of failure to process command line arguments with Unicode
-::  characters by Makefile/bash on GitHub Actions.
-.objs\tests\test_application_arguments.exe hello привет გამარჯობა 👋
+::  Run test driver executable and pass necessary arguments
+::  It is workaround of failure to process command line arguments with Unicode
+::  characters by Makefile/bash on GitHub Actions.
+chcp 65001
+.objs\tests\test_application_arguments.exe hello привет გამარჯობა 👋