Permalink
Browse files

Fix scripts OPy/byterun build/test scripts.

For now, it goes like this:

    cd opy/
    ./build.sh oil-repo  # build with OPy
    ./test.sh oil-unit  # run with CPython
    ./test.sh oil-unit-byterun  # run with byterun

There are still 3 test failures, prior to Yorba's fix.
  • Loading branch information...
Andy Chu
Andy Chu committed Apr 8, 2018
1 parent d15f920 commit ac26ef01b35ea39bc26ec4d73916d047c640cd4b
Showing with 10 additions and 10 deletions.
  1. +3 −6 opy/build.sh
  2. +3 −3 opy/byterun/pyvm2.py
  3. +4 −1 opy/common.sh
View
@@ -116,6 +116,9 @@ _fill-oil-tree() {
# Needed for help text.
ln -v -s -f --no-target-directory $PWD/../_build $dir/_build
# Running core/process_test.py depends on this existing!
mkdir -v -p $dir/_tmp
#make-mains $dir
}
@@ -134,12 +137,6 @@ oil-repo() {
_fill-oil-tree _tmp/oil-ccompile/
_fill-oil-tree _tmp/oil-opy/
#_compile-tree $src _tmp/osh-compile2/ compiler2 "${files[@]}"
# Not deterministic!
#_compile-tree $src _tmp/osh-compile2.gold/ compiler2 "${files[@]}"
#_compile-tree $src _tmp/osh-stdlib/ stdlib "${files[@]}"
}
_oil-bin-manifest() {
View
@@ -223,8 +223,8 @@ def dispatch(self, byteName, arguments):
#tb = sys.exc_info()[2]
#traceback.print_tb(tb)
debug1("Caught exception during execution of %s: %d", byteName,
len(self.frames))
#debug1("Caught exception during execution of %s: %d", byteName,
# len(self.frames))
why = 'exception'
self.except_frames = list(self.frames)
@@ -937,7 +937,7 @@ def call_function(self, arg, args, kwargs):
#debug1('do_wrap: %s', do_wrap)
if do_wrap:
debug1('*** WRAPPING %s', func)
#debug1('*** WRAPPING %s', func)
#debug1('%s', dir(func))
#debug1('__doc__ %s', func.__doc__)
View
@@ -54,7 +54,9 @@ _ccompile-one() {
misc/ccompile.py "$@"
}
# NOTE: Exclude _devbuild/cpython-full, but include _devbuild/gen.
# NOTES:
# - Exclude _devbuild/cpython-full, but include _devbuild/gen.
# - must exclude opy/testdata/, because some of it can't be compiled
# Has some similiarity to test/lint.sh, but not the same.
oil-python-sources() {
local repo_root=$1
@@ -66,6 +68,7 @@ oil-python-sources() {
-name _deps -a -prune -o \
-name _regtest -a -prune -o \
-name cpython-full -a -prune -o \
-name testdata -a -prune -o \
-name Python-2.7.13 -a -prune -o \
-name '*.py' -a -printf "$fmt"
}

0 comments on commit ac26ef0

Please sign in to comment.