[GR-64587] Fix NPE in --version

PullRequest: graalpython/3775

Author: msimacek

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java

@@ -848,7 +848,7 @@ protected void launch(Builder contextBuilder) {
                 rc = readEvalPrint(context, consoleHandler);
             }
         } catch (RuntimeException e) {
-            if (e.getMessage().contains("did not complete all polyglot threads")) {
+            if (e.getMessage() != null && e.getMessage().contains("did not complete all polyglot threads")) {
                 // Python may end up with stuck threads and code would legitimately expect those to
                 // simply die with the process. In an embedding (or CPython subinterpreters) this
                 // is a problem, so Truffle throws an IllegalStateException when closing the

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_cmd_line.txt

@@ -21,4 +21,5 @@ test.test_cmd_line.CmdLineTest.test_unbuffered_input @ darwin-arm64,darwin-x86_6
 test.test_cmd_line.CmdLineTest.test_unbuffered_output @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_cmd_line.CmdLineTest.test_unmached_quote @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_cmd_line.CmdLineTest.test_verbose @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
+test.test_cmd_line.CmdLineTest.test_version @ linux-x86_64
 test.test_cmd_line.IgnoreEnvironmentTest.test_ignore_PYTHONPATH @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

graalpython/lib-python/3/test/test_cmd_line.py

@@ -78,7 +78,8 @@ def test_site_flag(self):
         self.verify_valid_flag('-S')
 
     def test_version(self):
-        version = ('Python %d.%d' % sys.version_info[:2]).encode("ascii")
+        # GraalPy change: expect GraalPy name
+        version = ('GraalPy %d.%d' % sys.version_info[:2]).encode("ascii")
         for switch in '-V', '--version', '-VV':
             rc, out, err = assert_python_ok(switch)
             self.assertFalse(err.startswith(version))