[GR-23280][GR-23303][GR-23331][GR-23332] Pass more leftover app scripting tests

timfel · timfel · commit d4fb26f89451 · 2021-03-02T07:55:03.000Z
PullRequest: graalpython/1644
diff --git a/graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java b/graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java
@@ -351,7 +351,7 @@ private static void printShortHelp() {
     }
 
     private static void print(String string) {
-        System.out.println(string);
+        System.err.println(string);
     }
 
     private static String getLauncherExecName() {
@@ -703,7 +703,7 @@ protected String getLanguageId() {
 
     @Override
     protected void printHelp(OptionCategory maxCategory) {
-        print("usage: python [option] ... (-c cmd | file) [arg] ...\n" +
+        System.out.println("usage: python [option] ... (-c cmd | file) [arg] ...\n" +
                         "Options and arguments (and corresponding environment variables):\n" +
                         "-B     : this disables writing .py[co] files on import\n" +
                         "-c cmd : program passed in as string (terminates option list)\n" +
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/test_tagged_unittests.py b/graalpython/com.oracle.graal.python.test/src/tests/test_tagged_unittests.py
@@ -84,7 +84,7 @@ def test_tagged():
             cmd.append("--inspect")
         if "-debug-java" in sys.argv:
             cmd.append("-debug-java")
-        cmd += ["-S", RUNNER]
+        cmd += [RUNNER]
         for testpattern in working_test[1]:
             cmd.extend(["-k", testpattern])
         print("Running test:", working_test[0])
@@ -201,7 +201,7 @@ def main():
                 # (there will be one even if everything succeeds) filter out possible false-passes caused by
                 # the tests catching all exceptions somewhere
                 cmd += ['--experimental-options', '--python.CatchAllExceptions']
-            cmd += ["-S", RUNNER, "-v"]
+            cmd += [RUNNER, "-v"]
             tagfile = os.path.join(TAGS_DIR, testfile_stem + ".txt")
             if retag and repeat == 0:
                 test_selectors = []
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_builtin.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_builtin.txt
@@ -60,6 +60,7 @@
 *graalpython.lib-python.3.test.test_builtin.PtyTests.test_input_tty
 *graalpython.lib-python.3.test.test_builtin.PtyTests.test_input_tty_non_ascii
 *graalpython.lib-python.3.test.test_builtin.PtyTests.test_input_tty_non_ascii_unicode_errors
+*graalpython.lib-python.3.test.test_builtin.ShutdownTest.test_cleanup
 *graalpython.lib-python.3.test.test_builtin.TestBreakpoint.test_breakpoint
 *graalpython.lib-python.3.test.test_builtin.TestBreakpoint.test_breakpoint_with_args_and_keywords
 *graalpython.lib-python.3.test.test_builtin.TestBreakpoint.test_breakpoint_with_breakpointhook_reset
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_richcmp.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_richcmp.txt
@@ -5,6 +5,7 @@
 *graalpython.lib-python.3.test.test_richcmp.MiscTest.test_exception_message
 *graalpython.lib-python.3.test.test_richcmp.MiscTest.test_misbehavin
 *graalpython.lib-python.3.test.test_richcmp.MiscTest.test_not
+*graalpython.lib-python.3.test.test_richcmp.MiscTest.test_recursion
 *graalpython.lib-python.3.test.test_richcmp.NumberTest.test_basic
 *graalpython.lib-python.3.test.test_richcmp.NumberTest.test_values
 *graalpython.lib-python.3.test.test_richcmp.VectorTest.test_mixed
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_site.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_site.txt
@@ -0,0 +1,28 @@
+*graalpython.lib-python.3.test.test_site.HelperFunctionsTests.test__getuserbase
+*graalpython.lib-python.3.test.test_site.HelperFunctionsTests.test_addpackage
+*graalpython.lib-python.3.test.test_site.HelperFunctionsTests.test_addpackage_import_bad_exec
+*graalpython.lib-python.3.test.test_site.HelperFunctionsTests.test_addpackage_import_bad_pth_file
+*graalpython.lib-python.3.test.test_site.HelperFunctionsTests.test_addpackage_import_bad_syntax
+*graalpython.lib-python.3.test.test_site.HelperFunctionsTests.test_addsitedir
+*graalpython.lib-python.3.test.test_site.HelperFunctionsTests.test_get_path
+*graalpython.lib-python.3.test.test_site.HelperFunctionsTests.test_getuserbase
+*graalpython.lib-python.3.test.test_site.HelperFunctionsTests.test_getusersitepackages
+*graalpython.lib-python.3.test.test_site.HelperFunctionsTests.test_init_pathinfo
+*graalpython.lib-python.3.test.test_site.HelperFunctionsTests.test_makepath
+*graalpython.lib-python.3.test.test_site.HelperFunctionsTests.test_no_home_directory
+*graalpython.lib-python.3.test.test_site.HelperFunctionsTests.test_s_option
+*graalpython.lib-python.3.test.test_site.ImportSideEffectTests.test_abs_paths_cached_None
+*graalpython.lib-python.3.test.test_site.ImportSideEffectTests.test_add_build_dir
+*graalpython.lib-python.3.test.test_site.ImportSideEffectTests.test_aliasing_mbcs
+*graalpython.lib-python.3.test.test_site.ImportSideEffectTests.test_license_exists_at_url
+*graalpython.lib-python.3.test.test_site.ImportSideEffectTests.test_no_duplicate_paths
+*graalpython.lib-python.3.test.test_site.ImportSideEffectTests.test_setting_copyright
+*graalpython.lib-python.3.test.test_site.ImportSideEffectTests.test_setting_help
+*graalpython.lib-python.3.test.test_site.ImportSideEffectTests.test_setting_quit
+*graalpython.lib-python.3.test.test_site.ImportSideEffectTests.test_sitecustomize_executed
+*graalpython.lib-python.3.test.test_site.StartupImportTests.test_startup_interactivehook
+*graalpython.lib-python.3.test.test_site.StartupImportTests.test_startup_interactivehook_isolated
+*graalpython.lib-python.3.test.test_site.StartupImportTests.test_startup_interactivehook_isolated_explicit
+*graalpython.lib-python.3.test.test_site._pthFileTests.test_underpth_dll_file
+*graalpython.lib-python.3.test.test_site._pthFileTests.test_underpth_file
+*graalpython.lib-python.3.test.test_site._pthFileTests.test_underpth_nosite_file
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ImpModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ImpModuleBuiltins.java
@@ -609,6 +609,11 @@ PBytes run(long magicNumber, PBytesLike source) {
         PBytes run(PInt magicNumber, PBytesLike source) {
             return run(magicNumber.longValue(), source);
         }
+
+        @Specialization
+        PBytes run(int magicNumber, PBytesLike source) {
+            return run((long) magicNumber, source);
+        }
     }
 
     @Builtin(name = "_fix_co_filename", minNumOfPositionalArgs = 2)
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java
@@ -161,6 +161,7 @@
 import com.oracle.graal.python.util.OverflowException;
 import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.graal.python.util.Supplier;
+import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -1980,6 +1981,17 @@ private LenNode getLenNode() {
             return lenNode;
         }
 
+        private static final boolean testingEqualsWithDifferingLengths(int llen, int rlen, BinCmpOp op) {
+            // shortcut: if the lengths differ, the lists differ.
+            CompilerAsserts.compilationConstant(op);
+            if (op == Eq.INSTANCE) {
+                if (llen != rlen) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
         @SuppressWarnings("unused")
         @Specialization(guards = {"isEmpty(left)", "isEmpty(right)"})
         boolean doEmpty(SequenceStorage left, SequenceStorage right) {
@@ -1990,6 +2002,9 @@ boolean doEmpty(SequenceStorage left, SequenceStorage right) {
         boolean doBoolStorage(BoolSequenceStorage left, BoolSequenceStorage right) {
             int llen = left.length();
             int rlen = right.length();
+            if (testingEqualsWithDifferingLengths(llen, rlen, cmpOp)) {
+                return false;
+            }
             for (int i = 0; i < Math.min(llen, rlen); i++) {
                 int litem = PInt.intValue(left.getBoolItemNormalized(i));
                 int ritem = PInt.intValue(right.getBoolItemNormalized(i));
@@ -2004,6 +2019,9 @@ boolean doBoolStorage(BoolSequenceStorage left, BoolSequenceStorage right) {
         boolean doByteStorage(ByteSequenceStorage left, ByteSequenceStorage right) {
             int llen = left.length();
             int rlen = right.length();
+            if (testingEqualsWithDifferingLengths(llen, rlen, cmpOp)) {
+                return false;
+            }
             for (int i = 0; i < Math.min(llen, rlen); i++) {
                 byte litem = left.getByteItemNormalized(i);
                 byte ritem = right.getByteItemNormalized(i);
@@ -2018,6 +2036,9 @@ boolean doByteStorage(ByteSequenceStorage left, ByteSequenceStorage right) {
         boolean doIntStorage(IntSequenceStorage left, IntSequenceStorage right) {
             int llen = left.length();
             int rlen = right.length();
+            if (testingEqualsWithDifferingLengths(llen, rlen, cmpOp)) {
+                return false;
+            }
             for (int i = 0; i < Math.min(llen, rlen); i++) {
                 int litem = left.getIntItemNormalized(i);
                 int ritem = right.getIntItemNormalized(i);
@@ -2032,6 +2053,9 @@ boolean doIntStorage(IntSequenceStorage left, IntSequenceStorage right) {
         boolean doLongStorage(LongSequenceStorage left, LongSequenceStorage right) {
             int llen = left.length();
             int rlen = right.length();
+            if (testingEqualsWithDifferingLengths(llen, rlen, cmpOp)) {
+                return false;
+            }
             for (int i = 0; i < Math.min(llen, rlen); i++) {
                 long litem = left.getLongItemNormalized(i);
                 long ritem = right.getLongItemNormalized(i);
@@ -2046,6 +2070,9 @@ boolean doLongStorage(LongSequenceStorage left, LongSequenceStorage right) {
         boolean doDoubleStorage(DoubleSequenceStorage left, DoubleSequenceStorage right) {
             int llen = left.length();
             int rlen = right.length();
+            if (testingEqualsWithDifferingLengths(llen, rlen, cmpOp)) {
+                return false;
+            }
             for (int i = 0; i < Math.min(llen, rlen); i++) {
                 double litem = left.getDoubleItemNormalized(i);
                 double ritem = right.getDoubleItemNormalized(i);
@@ -2062,6 +2089,9 @@ boolean doGeneric(VirtualFrame frame, SequenceStorage left, SequenceStorage righ
                         @CachedLibrary(limit = "getCallSiteInlineCacheMaxDepth()") PythonObjectLibrary lib) {
             int llen = getLenNode().execute(left);
             int rlen = getLenNode().execute(right);
+            if (testingEqualsWithDifferingLengths(llen, rlen, cmpOp)) {
+                return false;
+            }
             ThreadState state;
             if (hasFrame.profile(frame != null)) {
                 state = PArguments.getThreadState(frame);
diff --git a/graalpython/lib-python/3/test/test_builtin.py b/graalpython/lib-python/3/test/test_builtin.py
@@ -1989,6 +1989,7 @@ def test_baddecorator(self):
 
 class ShutdownTest(unittest.TestCase):
 
+    @impl_detail("finalization", graalvm=False)
     def test_cleanup(self):
         # Issue #19255: builtins are still available at shutdown
         code = """if 1:
diff --git a/graalpython/lib-python/3/test/test_site.py b/graalpython/lib-python/3/test/test_site.py
@@ -30,6 +30,9 @@
 if sys.flags.no_site:
     raise unittest.SkipTest("Python was invoked with -S")
 
+# Make sure sysconfig._CONFIG_VARS is initialized for the tests below
+sysconfig.get_config_vars()
+
 import site
 
 

Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ private static void printShortHelp() {`
`351`	`351`	`}`
`352`	`352`
`353`	`353`	`private static void print(String string) {`
`354`		`- System.out.println(string);`
	`354`	`+ System.err.println(string);`
`355`	`355`	`}`
`356`	`356`
`357`	`357`	`private static String getLauncherExecName() {`
`@@ -703,7 +703,7 @@ protected String getLanguageId() {`
`703`	`703`
`704`	`704`	`@Override`
`705`	`705`	`protected void printHelp(OptionCategory maxCategory) {`
`706`		`- print("usage: python [option] ... (-c cmd \| file) [arg] ...\n" +`
	`706`	`+ System.out.println("usage: python [option] ... (-c cmd \| file) [arg] ...\n" +`
`707`	`707`	`"Options and arguments (and corresponding environment variables):\n" +`
`708`	`708`	`"-B : this disables writing .py[co] files on import\n" +`
`709`	`709`	`"-c cmd : program passed in as string (terminates option list)\n" +`
Original file line number	Diff line number	Diff line change
`@@ -609,6 +609,11 @@ PBytes run(long magicNumber, PBytesLike source) {`
`609`	`609`	`PBytes run(PInt magicNumber, PBytesLike source) {`
`610`	`610`	`return run(magicNumber.longValue(), source);`
`611`	`611`	`}`
	`612`	`+`
	`613`	`+ @Specialization`
	`614`	`+ PBytes run(int magicNumber, PBytesLike source) {`
	`615`	`+ return run((long) magicNumber, source);`
	`616`	`+ }`
`612`	`617`	`}`
`613`	`618`
`614`	`619`	`@Builtin(name = "_fix_co_filename", minNumOfPositionalArgs = 2)`