Skip to content

Commit 31845be

Browse files
authored
Merge pull request #1539 from xwings/dev
test python 3.11, add latest ubuntu, fix enum
2 parents 5dbde89 + fcd1f81 commit 31845be

File tree

3 files changed

+24
-25
lines changed

3 files changed

+24
-25
lines changed

.github/workflows/build-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ jobs:
1010
fail-fast: false
1111
matrix:
1212
#os: [windows-2019, macos-10.15, ubuntu-18.04, ubuntu-20.04]
13-
os: [windows-latest, ubuntu-20.04]
14-
python-version: ["3.8", "3.9", "^3"]
13+
os: [windows-latest, ubuntu-22.04]
14+
python-version: ["3.9", "3.11"]
1515
include:
1616
- os: ubuntu-22.04
1717
python-version: 3.9

qiling/os/posix/const.py

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -473,8 +473,8 @@ class macos_x86_open_flags(QlPrettyFlag):
473473
O_EXCL = 0x000800
474474
O_NOCTTY = 0x020000
475475
O_DIRECTORY = 0x100000
476-
O_BINARY = None
477-
O_LARGEFILE = None
476+
O_BINARY = 0x000000
477+
O_LARGEFILE = 0x000000
478478

479479

480480
class linux_x86_open_flags(QlPrettyFlag):
@@ -491,8 +491,8 @@ class linux_x86_open_flags(QlPrettyFlag):
491491
O_EXCL = 0x000080
492492
O_NOCTTY = 0x000100
493493
O_DIRECTORY = 0x010000
494-
O_BINARY = None
495-
O_LARGEFILE = None
494+
O_BINARY = 0x000000
495+
O_LARGEFILE = 0x000000
496496

497497

498498
class linux_arm_open_flags(QlPrettyFlag):
@@ -509,7 +509,7 @@ class linux_arm_open_flags(QlPrettyFlag):
509509
O_EXCL = 0x000080
510510
O_NOCTTY = 0x000100
511511
O_DIRECTORY = 0x004000
512-
O_BINARY = None
512+
O_BINARY = 0x000000
513513
O_LARGEFILE = 0x020000
514514

515515

@@ -527,7 +527,7 @@ class linux_mips_open_flags(QlPrettyFlag):
527527
O_EXCL = 0x000400
528528
O_NOCTTY = 0x000800
529529
O_DIRECTORY = 0x010000
530-
O_BINARY = None
530+
O_BINARY = 0x000000
531531
O_LARGEFILE = 0x002000
532532

533533

@@ -545,8 +545,8 @@ class linux_riscv_open_flags(QlPrettyFlag):
545545
O_EXCL = 0x000080
546546
O_NOCTTY = 0x000100
547547
O_DIRECTORY = 0x010000
548-
O_BINARY = None
549-
O_LARGEFILE = None
548+
O_BINARY = 0x000000
549+
O_LARGEFILE = 0x000000
550550

551551

552552
class linux_ppc_open_flags(QlPrettyFlag):
@@ -563,7 +563,7 @@ class linux_ppc_open_flags(QlPrettyFlag):
563563
O_EXCL = 0x000080
564564
O_NOCTTY = 0x000100
565565
O_DIRECTORY = 0x004000
566-
O_BINARY = None
566+
O_BINARY = 0x000000
567567
O_LARGEFILE = 0x010000
568568

569569

@@ -581,26 +581,26 @@ class freebsd_x86_open_flags(QlPrettyFlag):
581581
O_EXCL = 0x000800
582582
O_NOCTTY = 0x008000
583583
O_DIRECTORY = 0x20000
584-
O_BINARY = None
585-
O_LARGEFILE = None
584+
O_BINARY = 0x000000
585+
O_LARGEFILE = 0x000000
586586

587587

588588
class windows_x86_open_flags(QlPrettyFlag):
589589
O_RDONLY = 0x000000
590590
O_WRONLY = 0x000001
591591
O_RDWR = 0x000002
592-
O_NONBLOCK = None
592+
O_NONBLOCK = 0x000000
593593
O_APPEND = 0x000008
594-
O_ASYNC = None
595-
O_SYNC = None
596-
O_NOFOLLOW = None
594+
O_ASYNC = 0x000000
595+
O_SYNC = 0x000000
596+
O_NOFOLLOW = 0x000000
597597
O_CREAT = 0x000100
598598
O_TRUNC = 0x000200
599599
O_EXCL = 0x000400
600-
O_NOCTTY = None
601-
O_DIRECTORY = None
600+
O_NOCTTY = 0x000000
601+
O_DIRECTORY = 0x000000
602602
O_BINARY = 0x008000
603-
O_LARGEFILE = None
603+
O_LARGEFILE = 0x000000
604604

605605

606606
class qnx_arm_open_flags(QlPrettyFlag):
@@ -611,13 +611,13 @@ class qnx_arm_open_flags(QlPrettyFlag):
611611
O_APPEND = 0x00008
612612
O_ASYNC = 0x10000
613613
O_SYNC = 0x00020
614-
O_NOFOLLOW = None
614+
O_NOFOLLOW = 0x000000
615615
O_CREAT = 0x00100
616616
O_TRUNC = 0x00200
617617
O_EXCL = 0x00400
618618
O_NOCTTY = 0x00800
619-
O_DIRECTORY = None
620-
O_BINARY = None
619+
O_DIRECTORY = 0x000000
620+
O_BINARY = 0x000000
621621
O_LARGEFILE = 0x08000
622622

623623

tests/test_pe_sys.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88

99
from unicorn import UcError
1010

11-
from qiling.os.stats import QlWinNullStats
12-
1311
sys.path.append("..")
12+
from qiling.os.stats import QlWinNullStats
1413
from qiling import Qiling
1514
from qiling.const import QL_STOP, QL_VERBOSE
1615
from qiling.os.const import POINTER, DWORD, HANDLE

0 commit comments

Comments
 (0)