move testdata files to tests/

rlane · Sep 3, 2015 · 9338251 · 9338251
1 parent 782ac66
commit 9338251
Show file tree

Hide file tree

Showing 122 changed files with 48 additions and 2 deletions.
diff --git a/tests/expand-testcase.py → test_framework/expand-testcase.py b/tests/expand-testcase.py → test_framework/expand-testcase.py
diff --git a/tests/test_assembler.py → test_framework/test_assembler.py b/tests/test_assembler.py → test_framework/test_assembler.py
diff --git a/tests/test_disassembler.py → test_framework/test_disassembler.py b/tests/test_disassembler.py → test_framework/test_disassembler.py
diff --git a/tests/test_jit.py → test_framework/test_jit.py b/tests/test_jit.py → test_framework/test_jit.py
diff --git a/tests/test_roundtrip.py → test_framework/test_roundtrip.py b/tests/test_roundtrip.py → test_framework/test_roundtrip.py
diff --git a/tests/test_vm.py → test_framework/test_vm.py b/tests/test_vm.py → test_framework/test_vm.py
diff --git a/tests/testdata.py → test_framework/testdata.py b/tests/testdata.py → test_framework/testdata.py
@@ -1,7 +1,7 @@
 import os
 import re
 
-_test_data_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), "data")
+_test_data_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), "../tests")
 
 def list_files():
     """

diff --git a/tests/data/add.data → tests/add.data b/tests/data/add.data → tests/add.data
diff --git a/tests/data/alu-arith.data → tests/alu-arith.data b/tests/data/alu-arith.data → tests/alu-arith.data
diff --git a/tests/data/alu-bit.data → tests/alu-bit.data b/tests/data/alu-bit.data → tests/alu-bit.data
diff --git a/tests/data/alu.data → tests/alu.data b/tests/data/alu.data → tests/alu.data
diff --git a/tests/data/alu64-arith.data → tests/alu64-arith.data b/tests/data/alu64-arith.data → tests/alu64-arith.data
diff --git a/tests/data/alu64-bit.data → tests/alu64-bit.data b/tests/data/alu64-bit.data → tests/alu64-bit.data
diff --git a/tests/data/alu64.data → tests/alu64.data b/tests/data/alu64.data → tests/alu64.data
diff --git a/tests/data/arsh-reg.data → tests/arsh-reg.data b/tests/data/arsh-reg.data → tests/arsh-reg.data
diff --git a/tests/data/arsh.data → tests/arsh.data b/tests/data/arsh.data → tests/arsh.data
diff --git a/tests/data/arsh32-high-shift.data → tests/arsh32-high-shift.data b/tests/data/arsh32-high-shift.data → tests/arsh32-high-shift.data
diff --git a/tests/data/arsh64.data → tests/arsh64.data b/tests/data/arsh64.data → tests/arsh64.data
diff --git a/tests/data/be16-high.data → tests/be16-high.data b/tests/data/be16-high.data → tests/be16-high.data
diff --git a/tests/data/be16.data → tests/be16.data b/tests/data/be16.data → tests/be16.data
diff --git a/tests/data/be32-high.data → tests/be32-high.data b/tests/data/be32-high.data → tests/be32-high.data
diff --git a/tests/data/be32.data → tests/be32.data b/tests/data/be32.data → tests/be32.data
diff --git a/tests/data/be64.data → tests/be64.data b/tests/data/be64.data → tests/be64.data
diff --git a/tests/data/div32-high-divisor.data → tests/div32-high-divisor.data b/tests/data/div32-high-divisor.data → tests/div32-high-divisor.data
diff --git a/tests/data/div32-imm.data → tests/div32-imm.data b/tests/data/div32-imm.data → tests/div32-imm.data
diff --git a/tests/data/div32-reg.data → tests/div32-reg.data b/tests/data/div32-reg.data → tests/div32-reg.data
diff --git a/tests/data/div64-imm.data → tests/div64-imm.data b/tests/data/div64-imm.data → tests/div64-imm.data
diff --git a/tests/data/div64-reg.data → tests/div64-reg.data b/tests/data/div64-reg.data → tests/div64-reg.data
diff --git a/tests/data/early-exit.data → tests/early-exit.data b/tests/data/early-exit.data → tests/early-exit.data
diff --git a/tests/data/err-div-by-zero-imm.data → tests/err-div-by-zero-imm.data b/tests/data/err-div-by-zero-imm.data → tests/err-div-by-zero-imm.data
diff --git a/tests/data/err-div-by-zero-reg.data → tests/err-div-by-zero-reg.data b/tests/data/err-div-by-zero-reg.data → tests/err-div-by-zero-reg.data
diff --git a/tests/data/err-div64-by-zero-reg.data → tests/err-div64-by-zero-reg.data b/tests/data/err-div64-by-zero-reg.data → tests/err-div64-by-zero-reg.data
diff --git a/tests/data/err-endian-size.data → tests/err-endian-size.data b/tests/data/err-endian-size.data → tests/err-endian-size.data
diff --git a/tests/data/err-incomplete-lddw.data → tests/err-incomplete-lddw.data b/tests/data/err-incomplete-lddw.data → tests/err-incomplete-lddw.data
diff --git a/tests/data/err-incomplete-lddw2.data → tests/err-incomplete-lddw2.data b/tests/data/err-incomplete-lddw2.data → tests/err-incomplete-lddw2.data
diff --git a/tests/data/err-infinite-loop.data → tests/err-infinite-loop.data b/tests/data/err-infinite-loop.data → tests/err-infinite-loop.data
diff --git a/tests/data/err-invalid-reg-dst.data → tests/err-invalid-reg-dst.data b/tests/data/err-invalid-reg-dst.data → tests/err-invalid-reg-dst.data
diff --git a/tests/data/err-invalid-reg-src.data → tests/err-invalid-reg-src.data b/tests/data/err-invalid-reg-src.data → tests/err-invalid-reg-src.data
diff --git a/tests/data/err-jmp-lddw.data → tests/err-jmp-lddw.data b/tests/data/err-jmp-lddw.data → tests/err-jmp-lddw.data
diff --git a/tests/data/err-jmp-out.data → tests/err-jmp-out.data b/tests/data/err-jmp-out.data → tests/err-jmp-out.data
diff --git a/tests/data/err-mod-by-zero-reg.data → tests/err-mod-by-zero-reg.data b/tests/data/err-mod-by-zero-reg.data → tests/err-mod-by-zero-reg.data
diff --git a/tests/data/err-mod64-by-zero-reg.data → tests/err-mod64-by-zero-reg.data b/tests/data/err-mod64-by-zero-reg.data → tests/err-mod64-by-zero-reg.data
diff --git a/tests/data/err-noexit.data → tests/err-noexit.data b/tests/data/err-noexit.data → tests/err-noexit.data
diff --git a/tests/data/err-stack-oob.data → tests/err-stack-oob.data b/tests/data/err-stack-oob.data → tests/err-stack-oob.data
diff --git a/tests/data/err-too-many-instructions.data → tests/err-too-many-instructions.data b/tests/data/err-too-many-instructions.data → tests/err-too-many-instructions.data
diff --git a/tests/data/err-unknown-opcode.data → tests/err-unknown-opcode.data b/tests/data/err-unknown-opcode.data → tests/err-unknown-opcode.data
diff --git a/tests/data/err-write-r10.dst → tests/err-write-r10.dst b/tests/data/err-write-r10.dst → tests/err-write-r10.dst
diff --git a/tests/data/exit.data → tests/exit.data b/tests/data/exit.data → tests/exit.data
diff --git a/tests/data/ja.data → tests/ja.data b/tests/data/ja.data → tests/ja.data
diff --git a/tests/data/jeq-imm.data → tests/jeq-imm.data b/tests/data/jeq-imm.data → tests/jeq-imm.data
diff --git a/tests/data/jeq-reg.data → tests/jeq-reg.data b/tests/data/jeq-reg.data → tests/jeq-reg.data
diff --git a/tests/data/jge-imm.data → tests/jge-imm.data b/tests/data/jge-imm.data → tests/jge-imm.data
diff --git a/tests/data/jgt-imm.data → tests/jgt-imm.data b/tests/data/jgt-imm.data → tests/jgt-imm.data
diff --git a/tests/data/jgt-reg.data → tests/jgt-reg.data b/tests/data/jgt-reg.data → tests/jgt-reg.data
diff --git a/tests/data/jit-bounce.data → tests/jit-bounce.data b/tests/data/jit-bounce.data → tests/jit-bounce.data
diff --git a/tests/data/jmp.data → tests/jmp.data b/tests/data/jmp.data → tests/jmp.data
diff --git a/tests/data/jne-reg.data → tests/jne-reg.data b/tests/data/jne-reg.data → tests/jne-reg.data
diff --git a/tests/data/jset-imm.data → tests/jset-imm.data b/tests/data/jset-imm.data → tests/jset-imm.data
diff --git a/tests/data/jset-reg.data → tests/jset-reg.data b/tests/data/jset-reg.data → tests/jset-reg.data
diff --git a/tests/data/jsge-imm.data → tests/jsge-imm.data b/tests/data/jsge-imm.data → tests/jsge-imm.data
diff --git a/tests/data/jsge-reg.data → tests/jsge-reg.data b/tests/data/jsge-reg.data → tests/jsge-reg.data
diff --git a/tests/data/jsgt-imm.data → tests/jsgt-imm.data b/tests/data/jsgt-imm.data → tests/jsgt-imm.data
diff --git a/tests/data/jsgt-reg.data → tests/jsgt-reg.data b/tests/data/jsgt-reg.data → tests/jsgt-reg.data
diff --git a/tests/data/lddw.data → tests/lddw.data b/tests/data/lddw.data → tests/lddw.data
diff --git a/tests/data/lddw2.data → tests/lddw2.data b/tests/data/lddw2.data → tests/lddw2.data
diff --git a/tests/data/ldx.data → tests/ldx.data b/tests/data/ldx.data → tests/ldx.data
diff --git a/tests/data/ldxb-all.data → tests/ldxb-all.data b/tests/data/ldxb-all.data → tests/ldxb-all.data
diff --git a/tests/data/ldxb.data → tests/ldxb.data b/tests/data/ldxb.data → tests/ldxb.data
diff --git a/tests/data/ldxdw.data → tests/ldxdw.data b/tests/data/ldxdw.data → tests/ldxdw.data
diff --git a/tests/data/ldxh-all.data → tests/ldxh-all.data b/tests/data/ldxh-all.data → tests/ldxh-all.data
diff --git a/tests/data/ldxh-all2.data → tests/ldxh-all2.data b/tests/data/ldxh-all2.data → tests/ldxh-all2.data
diff --git a/tests/data/ldxh-same-reg.data → tests/ldxh-same-reg.data b/tests/data/ldxh-same-reg.data → tests/ldxh-same-reg.data
diff --git a/tests/data/ldxh.data → tests/ldxh.data b/tests/data/ldxh.data → tests/ldxh.data
diff --git a/tests/data/ldxw-all.data → tests/ldxw-all.data b/tests/data/ldxw-all.data → tests/ldxw-all.data
diff --git a/tests/data/ldxw.data → tests/ldxw.data b/tests/data/ldxw.data → tests/ldxw.data
diff --git a/tests/data/le16.data → tests/le16.data b/tests/data/le16.data → tests/le16.data
diff --git a/tests/data/le32.data → tests/le32.data b/tests/data/le32.data → tests/le32.data
diff --git a/tests/data/le64.data → tests/le64.data b/tests/data/le64.data → tests/le64.data
diff --git a/tests/data/lsh-reg.data → tests/lsh-reg.data b/tests/data/lsh-reg.data → tests/lsh-reg.data
diff --git a/tests/data/mod.data → tests/mod.data b/tests/data/mod.data → tests/mod.data
diff --git a/tests/data/mod32.data → tests/mod32.data b/tests/data/mod32.data → tests/mod32.data
diff --git a/tests/data/mod64.data → tests/mod64.data b/tests/data/mod64.data → tests/mod64.data
diff --git a/tests/data/mov.data → tests/mov.data b/tests/data/mov.data → tests/mov.data
diff --git a/tests/data/mul-loop.data → tests/mul-loop.data b/tests/data/mul-loop.data → tests/mul-loop.data
diff --git a/tests/data/mul32-imm.data → tests/mul32-imm.data b/tests/data/mul32-imm.data → tests/mul32-imm.data
diff --git a/tests/data/mul32-reg-overflow.data → tests/mul32-reg-overflow.data b/tests/data/mul32-reg-overflow.data → tests/mul32-reg-overflow.data
diff --git a/tests/data/mul32-reg.data → tests/mul32-reg.data b/tests/data/mul32-reg.data → tests/mul32-reg.data
diff --git a/tests/data/mul64-imm.data → tests/mul64-imm.data b/tests/data/mul64-imm.data → tests/mul64-imm.data
diff --git a/tests/data/mul64-reg.data → tests/mul64-reg.data b/tests/data/mul64-reg.data → tests/mul64-reg.data
diff --git a/tests/data/neg.data → tests/neg.data b/tests/data/neg.data → tests/neg.data
diff --git a/tests/data/neg64.data → tests/neg64.data b/tests/data/neg64.data → tests/neg64.data
diff --git a/tests/data/prime.data → tests/prime.data b/tests/data/prime.data → tests/prime.data
diff --git a/tests/data/rsh-reg.data → tests/rsh-reg.data b/tests/data/rsh-reg.data → tests/rsh-reg.data
diff --git a/tests/data/rsh32.data → tests/rsh32.data b/tests/data/rsh32.data → tests/rsh32.data
diff --git a/tests/data/st.data → tests/st.data b/tests/data/st.data → tests/st.data
diff --git a/tests/data/stack.data → tests/stack.data b/tests/data/stack.data → tests/stack.data
diff --git a/tests/data/stb.data → tests/stb.data b/tests/data/stb.data → tests/stb.data
diff --git a/tests/data/stdw.data → tests/stdw.data b/tests/data/stdw.data → tests/stdw.data
diff --git a/tests/data/sth.data → tests/sth.data b/tests/data/sth.data → tests/sth.data
diff --git a/tests/data/stw.data → tests/stw.data b/tests/data/stw.data → tests/stw.data
diff --git a/tests/data/stx.data → tests/stx.data b/tests/data/stx.data → tests/stx.data
diff --git a/tests/data/stxb-all.data → tests/stxb-all.data b/tests/data/stxb-all.data → tests/stxb-all.data
diff --git a/tests/data/stxb-all2.data → tests/stxb-all2.data b/tests/data/stxb-all2.data → tests/stxb-all2.data
diff --git a/tests/data/stxb-chain.data → tests/stxb-chain.data b/tests/data/stxb-chain.data → tests/stxb-chain.data
diff --git a/tests/data/stxb.data → tests/stxb.data b/tests/data/stxb.data → tests/stxb.data
diff --git a/tests/data/stxdw.data → tests/stxdw.data b/tests/data/stxdw.data → tests/stxdw.data
diff --git a/tests/data/stxh.data → tests/stxh.data b/tests/data/stxh.data → tests/stxh.data
diff --git a/tests/data/stxw.data → tests/stxw.data b/tests/data/stxw.data → tests/stxw.data
diff --git a/tests/data/subnet.data → tests/subnet.data b/tests/data/subnet.data → tests/subnet.data
diff --git a/tests/data/tcp-port-80/match.data → tests/tcp-port-80/match.data b/tests/data/tcp-port-80/match.data → tests/tcp-port-80/match.data
diff --git a/...s/data/tcp-port-80/nomatch-ethertype.data → tests/tcp-port-80/nomatch-ethertype.data b/...s/data/tcp-port-80/nomatch-ethertype.data → tests/tcp-port-80/nomatch-ethertype.data
diff --git a/tests/data/tcp-port-80/nomatch-proto.data → tests/tcp-port-80/nomatch-proto.data b/tests/data/tcp-port-80/nomatch-proto.data → tests/tcp-port-80/nomatch-proto.data
diff --git a/tests/data/tcp-port-80/nomatch.data → tests/tcp-port-80/nomatch.data b/tests/data/tcp-port-80/nomatch.data → tests/tcp-port-80/nomatch.data
diff --git a/tests/data/tcp-port-80/tcp-port-80.asm → tests/tcp-port-80/tcp-port-80.asm b/tests/data/tcp-port-80/tcp-port-80.asm → tests/tcp-port-80/tcp-port-80.asm
diff --git a/tests/tcp-sack/.gitignore b/tests/tcp-sack/.gitignore
@@ -0,0 +1,2 @@
+*.o
+*.bin
diff --git a/tests/data/tcp-sack/Makefile → tests/tcp-sack/Makefile b/tests/data/tcp-sack/Makefile → tests/tcp-sack/Makefile
@@ -1,7 +1,7 @@
 PROG := tcp-sack
 
 $(PROG).asm: $(PROG).bin
-	../../../bin/ubpf-disassembler $^ $@
+	../../bin/ubpf-disassembler $^ $@
 
 $(PROG).bin: $(PROG).o
 	objcopy -I elf64-little -O binary $^ $@

diff --git a/tests/data/tcp-sack/match.data → tests/tcp-sack/match.data b/tests/data/tcp-sack/match.data → tests/tcp-sack/match.data
diff --git a/tests/data/tcp-sack/nomatch.data → tests/tcp-sack/nomatch.data b/tests/data/tcp-sack/nomatch.data → tests/tcp-sack/nomatch.data
diff --git a/tests/data/tcp-sack/pkt-nosack.hex → tests/tcp-sack/pkt-nosack.hex b/tests/data/tcp-sack/pkt-nosack.hex → tests/tcp-sack/pkt-nosack.hex
diff --git a/tests/data/tcp-sack/pkt-sack.hex → tests/tcp-sack/pkt-sack.hex b/tests/data/tcp-sack/pkt-sack.hex → tests/tcp-sack/pkt-sack.hex
diff --git a/tests/tcp-sack/tcp-sack.asm b/tests/tcp-sack/tcp-sack.asm
@@ -0,0 +1,44 @@
+ldxb r2, [r1+12]
+ldxb r3, [r1+13]
+lsh r3, 0x8
+or r3, r2
+mov r0, 0x0
+jne r3, 0x8, +37
+ldxb r2, [r1+23]
+jne r2, 0x6, +35
+ldxb r2, [r1+14]
+add r1, 0xe
+and r2, 0xf
+lsh r2, 0x2
+add r1, r2
+mov r0, 0x0
+ldxh r4, [r1+12]
+add r1, 0x14
+rsh r4, 0x2
+and r4, 0x3c
+mov r2, r4
+add r2, 0xffffffec
+mov r5, 0x15
+mov r3, 0x0
+jgt r5, r4, +20
+mov r5, r3
+lsh r5, 0x20
+arsh r5, 0x20
+mov r4, r1
+add r4, r5
+ldxb r5, [r4]
+jeq r5, 0x1, +4
+jeq r5, 0x0, +12
+mov r6, r3
+jeq r5, 0x5, +9
+ja +2
+add r3, 0x1
+mov r6, r3
+ldxb r3, [r4+1]
+add r3, r6
+lsh r3, 0x20
+arsh r3, 0x20
+jsgt r2, r3, -18
+ja +1
+mov r0, 0x1
+exit
diff --git a/tests/data/tcp-sack/tcp-sack.c → tests/tcp-sack/tcp-sack.c b/tests/data/tcp-sack/tcp-sack.c → tests/tcp-sack/tcp-sack.c