Move test files into "test" directory

cloudnepal · Dec 19, 2024 · 0f8f619 · 0f8f619
1 parent def5b5e
commit 0f8f619
Show file tree

Hide file tree

Showing 187 changed files with 77 additions and 69 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -45,13 +45,14 @@
 **/lib*.pc
 
 # Local excludes in root directory
-t/__pycache__/
-log/
+test/t/__pycache__/
+test/__pycache__/
+test/log/
 log_docker_build/
-results/
-tmp_check/
-tmp_check_iso/
-output_iso/
+test/results/
+test/tmp_check/
+test/tmp_check_iso/
+test/output_iso/
 include/utils/stopevents_defs.h
 include/utils/stopevents_data.h
 orioledb.typedefs
@@ -81,4 +82,4 @@ ci/docker_matrix.sh
 doc/
 
 # Exclude the PostGIS Docker build directory
-docker-postgis
+docker-postgis
diff --git a/.gitignore b/.gitignore
@@ -36,17 +36,18 @@ lib*dll.def
 lib*.pc
 
 # Local excludes in root directory
-/t/__pycache__/
-/log/
+/test/t/__pycache__/
+/test/__pycache__/
+/test/log/
 /log_docker_build/
-/results/
-/tmp_check/
-/tmp_check_iso/
-/output_iso/
+/test/results/
+/test/tmp_check/
+/test/tmp_check_iso/
+/test/output_iso/
 /include/utils/stopevents_defs.h
 /include/utils/stopevents_data.h
 /orioledb.typedefs
 !ci/antithesis/libvoidstar.so
 
 # Exclude the PostGIS Docker build directory
-/docker-postgis
+/docker-postgis
diff --git a/Makefile b/Makefile
@@ -140,44 +140,47 @@ ISOLATIONCHECKS = bitmap_hist_scan \
 				  rll_subtrans \
 				  table_lock_test \
 				  uniq
-TESTGRESCHECKS_PART_1 = t/checkpointer_test.py \
-						t/eviction_bgwriter_test.py \
-						t/eviction_compression_test.py \
-						t/eviction_test.py \
-						t/file_operations_test.py \
-						t/files_test.py \
-						t/incomplete_split_test.py \
-						t/merge_test.py \
-						t/o_tables_test.py \
-						t/o_tables_2_test.py \
-						t/recovery_test.py \
-						t/recovery_opclass_test.py \
-						t/recovery_worker_test.py \
-						t/replication_test.py \
-						t/types_test.py \
-						t/undo_eviction_test.py
-TESTGRESCHECKS_PART_2 = t/checkpoint_concurrent_test.py \
-						t/checkpoint_eviction_test.py \
-						t/checkpoint_same_trx_test.py \
-						t/checkpoint_split1_test.py \
-						t/checkpoint_split2_test.py \
-						t/checkpoint_split3_test.py \
-						t/checkpoint_update_compress_test.py \
-						t/checkpoint_update_test.py \
-						t/ddl_test.py \
-						t/eviction_full_memory_test.py \
-						t/include_indices_test.py \
-						t/indices_build_test.py \
-						t/logical_test.py \
-						t/not_supported_yet_test.py \
-						t/parallel_test.py \
-						t/reindex_test.py \
-						t/s3_test.py \
-						t/schema_test.py \
-						t/toast_index_test.py \
-						t/trigger_test.py \
-						t/unlogged_test.py \
-						t/vacuum_test.py
+TESTGRESCHECKS_PART_1 = test/t/checkpointer_test.py \
+						test/t/eviction_bgwriter_test.py \
+						test/t/eviction_compression_test.py \
+						test/t/eviction_test.py \
+						test/t/file_operations_test.py \
+						test/t/files_test.py \
+						test/t/incomplete_split_test.py \
+						test/t/merge_test.py \
+						test/t/o_tables_test.py \
+						test/t/o_tables_2_test.py \
+						test/t/recovery_test.py \
+						test/t/recovery_opclass_test.py \
+						test/t/recovery_worker_test.py \
+						test/t/replication_test.py \
+						test/t/types_test.py \
+						test/t/undo_eviction_test.py
+TESTGRESCHECKS_PART_2 = test/t/checkpoint_concurrent_test.py \
+						test/t/checkpoint_eviction_test.py \
+						test/t/checkpoint_same_trx_test.py \
+						test/t/checkpoint_split1_test.py \
+						test/t/checkpoint_split2_test.py \
+						test/t/checkpoint_split3_test.py \
+						test/t/checkpoint_update_compress_test.py \
+						test/t/checkpoint_update_test.py \
+						test/t/ddl_test.py \
+						test/t/eviction_full_memory_test.py \
+						test/t/include_indices_test.py \
+						test/t/indices_build_test.py \
+						test/t/logical_test.py \
+						test/t/not_supported_yet_test.py \
+						test/t/parallel_test.py \
+						test/t/reindex_test.py \
+						test/t/s3_test.py \
+						test/t/schema_test.py \
+						test/t/toast_index_test.py \
+						test/t/trigger_test.py \
+						test/t/unlogged_test.py \
+						test/t/vacuum_test.py
+
+PG_REGRESS_ARGS=--no-locale --inputdir=test --outputdir=test
+
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
@@ -190,21 +193,19 @@ ifeq ($(shell expr $(MAJORVERSION) \>= 14), 1)
 endif
 
 ifeq ($(shell expr $(MAJORVERSION) \>= 15), 1)
-  TESTGRESCHECKS_PART_2 += t/merge_into_test.py
+  TESTGRESCHECKS_PART_2 += test/t/merge_into_test.py
   ISOLATIONCHECKS += isol_merge
 endif
 
-PG_REGRESS_ARGS=--no-locale
-
 regresscheck: | install
 	$(pg_regress_check) \
-		--temp-config orioledb_regression.conf \
+		--temp-config test/orioledb_regression.conf \
 		$(PG_REGRESS_ARGS) \
 		$(REGRESSCHECKS)
 
 isolationcheck: | install
 	$(pg_isolation_regress_check) \
-		--temp-config orioledb_isolation.conf \
+		--temp-config test/orioledb_isolation.conf \
 		$(PG_REGRESS_ARGS) \
 		$(ISOLATIONCHECKS)
 
@@ -224,12 +225,14 @@ include $(top_srcdir)/contrib/contrib-global.mk
 
 regresscheck: | submake-regress submake-orioledb temp-install
 	$(pg_regress_check) \
-		--temp-config $(top_srcdir)/contrib/orioledb/orioledb_regression.conf \
+		--temp-config $(top_srcdir)/contrib/orioledb/test/orioledb_regression.conf \
+		$(PG_REGRESS_ARGS) \
 		$(REGRESSCHECKS)
 
 isolationcheck: | submake-isolation submake-orioledb temp-install
 	$(pg_isolation_regress_check) \
-		--temp-config $(top_srcdir)/contrib/orioledb/orioledb_isolation.conf \
+		--temp-config $(top_srcdir)/contrib/orioledb/test/orioledb_isolation.conf \
+		$(PG_REGRESS_ARGS) \
 		$(ISOLATIONCHECKS)
 
 $(TESTGRESCHECKS_PART_1) $(TESTGRESCHECKS_PART_2): | submake-orioledb temp-install
@@ -311,7 +314,7 @@ pgindent: orioledb.typedefs
 	include/*/*.h
 
 yapf:
-	yapf -i t/*.py
+	yapf -i test/t/*.py
 	yapf -i *.py
 
 .PHONY: submake-orioledb submake-regress check \

diff --git a/doc/contributing/structure.mdx b/doc/contributing/structure.mdx
@@ -20,22 +20,25 @@ orioledb
 |
 |- ci  -- scripts used within build.yml workflow
 |- doc -- documentation
-|- expected -- expected output for regression and isolation tests
 |- include -- C-headers of extension
-|- specs -- isolation tests
-|- sql -- regression tests
 |- src -- C-sources of extension
-|- t -- python tests
-|
+|- test
+|  |- expected -- expected output for regression and isolation tests
+|  |- specs -- isolation tests
+|  |- sql -- regression tests
+|  |- t -- python tests
+|  |- tests -- Docker images tests
+|  |- README.md -- Docker images tests documentation
+|  |- orioledb-config.sh -- Docker images tests configuration
+|  |- orioledb_isolation.conf -- configuration file used during isolation tests
+|  |- orioledb_regression.conf -- configuration file used during regression tests
 |- Dockerfile -- Dockerfile used within docker.yml workflow
 |- LICENSE -- defines PostgreSQL-licence for the project
 |- Makefile -- defines make targets
 |- README.md -- main documentation entrypoint
 |- docker-entrypoint.sh -- entrypoint file for Docker images
 |- orioledb--1.0.sql -- script for definition of extension SQL-level objects
 |- orioledb.control -- extension control file
-|- orioledb_isolation.conf -- configuration file used during isolation tests
-|- orioledb_regression.conf -- configuration file used during regression tests
 |- stopevents.txt -- list of "stop event"
 |- stopevents_gen.py -- generates include/utils/stopevents_(defs|data).h from stopevents.txt
 |- typedefs_gen.py -- generates list of C-symbols in orioledb.so to orioledb.typedefs

diff --git a/test/__init__.py b/test/__init__.py
diff --git a/expected/alter_type.out → test/expected/alter_type.out b/expected/alter_type.out → test/expected/alter_type.out
diff --git a/expected/bitmap_hist_scan.out → test/expected/bitmap_hist_scan.out b/expected/bitmap_hist_scan.out → test/expected/bitmap_hist_scan.out
diff --git a/expected/bitmap_scan.out → test/expected/bitmap_scan.out b/expected/bitmap_scan.out → test/expected/bitmap_scan.out
diff --git a/expected/bitmap_scan_1.out → test/expected/bitmap_scan_1.out b/expected/bitmap_scan_1.out → test/expected/bitmap_scan_1.out
diff --git a/expected/btree_compression.out → test/expected/btree_compression.out b/expected/btree_compression.out → test/expected/btree_compression.out
diff --git a/expected/btree_iterate.out → test/expected/btree_iterate.out b/expected/btree_iterate.out → test/expected/btree_iterate.out
diff --git a/expected/btree_print.out → test/expected/btree_print.out b/expected/btree_print.out → test/expected/btree_print.out
diff --git a/expected/btree_print_backend_id.out → test/expected/btree_print_backend_id.out b/expected/btree_print_backend_id.out → test/expected/btree_print_backend_id.out
diff --git a/expected/btree_sys_check.out → test/expected/btree_sys_check.out b/expected/btree_sys_check.out → test/expected/btree_sys_check.out
diff --git a/expected/btree_sys_check_1.out → test/expected/btree_sys_check_1.out b/expected/btree_sys_check_1.out → test/expected/btree_sys_check_1.out
diff --git a/expected/concurrent_update_delete.out → test/expected/concurrent_update_delete.out b/expected/concurrent_update_delete.out → test/expected/concurrent_update_delete.out
diff --git a/expected/createas.out → test/expected/createas.out b/expected/createas.out → test/expected/createas.out
diff --git a/expected/createas_1.out → test/expected/createas_1.out b/expected/createas_1.out → test/expected/createas_1.out
diff --git a/expected/ddl.out → test/expected/ddl.out b/expected/ddl.out → test/expected/ddl.out
diff --git a/expected/ddl_1.out → test/expected/ddl_1.out b/expected/ddl_1.out → test/expected/ddl_1.out
diff --git a/expected/explain.out → test/expected/explain.out b/expected/explain.out → test/expected/explain.out
diff --git a/expected/explain_1.out → test/expected/explain_1.out b/expected/explain_1.out → test/expected/explain_1.out
diff --git a/expected/fkeys.out → test/expected/fkeys.out b/expected/fkeys.out → test/expected/fkeys.out
diff --git a/expected/foreign_keys.out → test/expected/foreign_keys.out b/expected/foreign_keys.out → test/expected/foreign_keys.out
diff --git a/expected/generated.out → test/expected/generated.out b/expected/generated.out → test/expected/generated.out
diff --git a/expected/getsomeattrs.out → test/expected/getsomeattrs.out b/expected/getsomeattrs.out → test/expected/getsomeattrs.out
diff --git a/expected/getsomeattrs_1.out → test/expected/getsomeattrs_1.out b/expected/getsomeattrs_1.out → test/expected/getsomeattrs_1.out
diff --git a/expected/included.out → test/expected/included.out b/expected/included.out → test/expected/included.out
diff --git a/expected/indices.out → test/expected/indices.out b/expected/indices.out → test/expected/indices.out
diff --git a/expected/indices_1.out → test/expected/indices_1.out b/expected/indices_1.out → test/expected/indices_1.out
diff --git a/expected/indices_build.out → test/expected/indices_build.out b/expected/indices_build.out → test/expected/indices_build.out
diff --git a/expected/inherits.out → test/expected/inherits.out b/expected/inherits.out → test/expected/inherits.out
diff --git a/expected/inherits_1.out → test/expected/inherits_1.out b/expected/inherits_1.out → test/expected/inherits_1.out
diff --git a/expected/insert_fails.out → test/expected/insert_fails.out b/expected/insert_fails.out → test/expected/insert_fails.out
diff --git a/expected/ioc.out → test/expected/ioc.out b/expected/ioc.out → test/expected/ioc.out
diff --git a/expected/ioc_deadlock.out → test/expected/ioc_deadlock.out b/expected/ioc_deadlock.out → test/expected/ioc_deadlock.out
diff --git a/expected/ioc_lost_update.out → test/expected/ioc_lost_update.out b/expected/ioc_lost_update.out → test/expected/ioc_lost_update.out
diff --git a/expected/isol_ddl.out → test/expected/isol_ddl.out b/expected/isol_ddl.out → test/expected/isol_ddl.out
diff --git a/expected/isol_merge.out → test/expected/isol_merge.out b/expected/isol_merge.out → test/expected/isol_merge.out
diff --git a/expected/isol_rc.out → test/expected/isol_rc.out b/expected/isol_rc.out → test/expected/isol_rc.out
diff --git a/expected/isol_rr.out → test/expected/isol_rr.out b/expected/isol_rr.out → test/expected/isol_rr.out
diff --git a/expected/isol_rr_bscan.out → test/expected/isol_rr_bscan.out b/expected/isol_rr_bscan.out → test/expected/isol_rr_bscan.out
diff --git a/expected/isol_rr_seqscan.out → test/expected/isol_rr_seqscan.out b/expected/isol_rr_seqscan.out → test/expected/isol_rr_seqscan.out
diff --git a/expected/joins.out → test/expected/joins.out b/expected/joins.out → test/expected/joins.out
diff --git a/expected/load_refind_page.out → test/expected/load_refind_page.out b/expected/load_refind_page.out → test/expected/load_refind_page.out
diff --git a/expected/merge.out → test/expected/merge.out b/expected/merge.out → test/expected/merge.out
diff --git a/expected/nulls.out → test/expected/nulls.out b/expected/nulls.out → test/expected/nulls.out
diff --git a/expected/nulls_1.out → test/expected/nulls_1.out b/expected/nulls_1.out → test/expected/nulls_1.out
diff --git a/expected/opclass.out → test/expected/opclass.out b/expected/opclass.out → test/expected/opclass.out
diff --git a/expected/opclass_1.out → test/expected/opclass_1.out b/expected/opclass_1.out → test/expected/opclass_1.out
diff --git a/expected/parallel_scan.out → test/expected/parallel_scan.out b/expected/parallel_scan.out → test/expected/parallel_scan.out
diff --git a/expected/parallel_scan_1.out → test/expected/parallel_scan_1.out b/expected/parallel_scan_1.out → test/expected/parallel_scan_1.out
diff --git a/expected/partial.out → test/expected/partial.out b/expected/partial.out → test/expected/partial.out
diff --git a/expected/partial_1.out → test/expected/partial_1.out b/expected/partial_1.out → test/expected/partial_1.out
diff --git a/expected/partition.out → test/expected/partition.out b/expected/partition.out → test/expected/partition.out
diff --git a/expected/partition_1.out → test/expected/partition_1.out b/expected/partition_1.out → test/expected/partition_1.out
diff --git a/expected/partition_move.out → test/expected/partition_move.out b/expected/partition_move.out → test/expected/partition_move.out
diff --git a/expected/primary_key.out → test/expected/primary_key.out b/expected/primary_key.out → test/expected/primary_key.out
diff --git a/expected/primary_key_1.out → test/expected/primary_key_1.out b/expected/primary_key_1.out → test/expected/primary_key_1.out
diff --git a/expected/rightlink.out → test/expected/rightlink.out b/expected/rightlink.out → test/expected/rightlink.out
diff --git a/expected/rll.out → test/expected/rll.out b/expected/rll.out → test/expected/rll.out
diff --git a/expected/rll_deadlock.out → test/expected/rll_deadlock.out b/expected/rll_deadlock.out → test/expected/rll_deadlock.out
diff --git a/expected/rll_mix.out → test/expected/rll_mix.out b/expected/rll_mix.out → test/expected/rll_mix.out
diff --git a/expected/rll_subtrans.out → test/expected/rll_subtrans.out b/expected/rll_subtrans.out → test/expected/rll_subtrans.out
diff --git a/expected/row_level_locks.out → test/expected/row_level_locks.out b/expected/row_level_locks.out → test/expected/row_level_locks.out
diff --git a/expected/row_security.out → test/expected/row_security.out b/expected/row_security.out → test/expected/row_security.out
diff --git a/expected/subquery.out → test/expected/subquery.out b/expected/subquery.out → test/expected/subquery.out
diff --git a/expected/subtransactions.out → test/expected/subtransactions.out b/expected/subtransactions.out → test/expected/subtransactions.out
diff --git a/expected/table_lock_test.out → test/expected/table_lock_test.out b/expected/table_lock_test.out → test/expected/table_lock_test.out
diff --git a/expected/tableam.out → test/expected/tableam.out b/expected/tableam.out → test/expected/tableam.out
diff --git a/expected/temp.out → test/expected/temp.out b/expected/temp.out → test/expected/temp.out
diff --git a/expected/toast.out → test/expected/toast.out b/expected/toast.out → test/expected/toast.out
diff --git a/expected/toast_column_compress.out → test/expected/toast_column_compress.out b/expected/toast_column_compress.out → test/expected/toast_column_compress.out
diff --git a/expected/toast_column_compress_1.out → test/expected/toast_column_compress_1.out b/expected/toast_column_compress_1.out → test/expected/toast_column_compress_1.out
diff --git a/expected/trigger.out → test/expected/trigger.out b/expected/trigger.out → test/expected/trigger.out
diff --git a/expected/truncate.out → test/expected/truncate.out b/expected/truncate.out → test/expected/truncate.out
diff --git a/expected/types.out → test/expected/types.out b/expected/types.out → test/expected/types.out
diff --git a/expected/uniq.out → test/expected/uniq.out b/expected/uniq.out → test/expected/uniq.out
diff --git a/orioledb_isolation.conf → test/orioledb_isolation.conf b/orioledb_isolation.conf → test/orioledb_isolation.conf
diff --git a/orioledb_regression.conf → test/orioledb_regression.conf b/orioledb_regression.conf → test/orioledb_regression.conf
diff --git a/specs/bitmap_hist_scan.spec → test/specs/bitmap_hist_scan.spec b/specs/bitmap_hist_scan.spec → test/specs/bitmap_hist_scan.spec
diff --git a/specs/btree_iterate.spec → test/specs/btree_iterate.spec b/specs/btree_iterate.spec → test/specs/btree_iterate.spec
diff --git a/specs/btree_print_backend_id.spec → test/specs/btree_print_backend_id.spec b/specs/btree_print_backend_id.spec → test/specs/btree_print_backend_id.spec
diff --git a/specs/concurrent_update_delete.spec → test/specs/concurrent_update_delete.spec b/specs/concurrent_update_delete.spec → test/specs/concurrent_update_delete.spec
diff --git a/specs/fkeys.spec → test/specs/fkeys.spec b/specs/fkeys.spec → test/specs/fkeys.spec
diff --git a/specs/included.spec → test/specs/included.spec b/specs/included.spec → test/specs/included.spec
diff --git a/specs/insert_fails.spec → test/specs/insert_fails.spec b/specs/insert_fails.spec → test/specs/insert_fails.spec
diff --git a/specs/ioc_deadlock.spec → test/specs/ioc_deadlock.spec b/specs/ioc_deadlock.spec → test/specs/ioc_deadlock.spec
diff --git a/specs/ioc_lost_update.spec → test/specs/ioc_lost_update.spec b/specs/ioc_lost_update.spec → test/specs/ioc_lost_update.spec
diff --git a/specs/isol_ddl.spec → test/specs/isol_ddl.spec b/specs/isol_ddl.spec → test/specs/isol_ddl.spec
diff --git a/specs/isol_merge.spec → test/specs/isol_merge.spec b/specs/isol_merge.spec → test/specs/isol_merge.spec
diff --git a/specs/isol_rc.spec → test/specs/isol_rc.spec b/specs/isol_rc.spec → test/specs/isol_rc.spec
diff --git a/specs/isol_rr.spec → test/specs/isol_rr.spec b/specs/isol_rr.spec → test/specs/isol_rr.spec
diff --git a/specs/isol_rr_bscan.spec → test/specs/isol_rr_bscan.spec b/specs/isol_rr_bscan.spec → test/specs/isol_rr_bscan.spec
diff --git a/specs/isol_rr_seqscan.spec → test/specs/isol_rr_seqscan.spec b/specs/isol_rr_seqscan.spec → test/specs/isol_rr_seqscan.spec
diff --git a/specs/load_refind_page.spec → test/specs/load_refind_page.spec b/specs/load_refind_page.spec → test/specs/load_refind_page.spec
diff --git a/specs/merge.spec → test/specs/merge.spec b/specs/merge.spec → test/specs/merge.spec
diff --git a/specs/partition_move.spec → test/specs/partition_move.spec b/specs/partition_move.spec → test/specs/partition_move.spec
diff --git a/specs/rightlink.spec → test/specs/rightlink.spec b/specs/rightlink.spec → test/specs/rightlink.spec
diff --git a/specs/rll.spec → test/specs/rll.spec b/specs/rll.spec → test/specs/rll.spec
diff --git a/specs/rll_deadlock.spec → test/specs/rll_deadlock.spec b/specs/rll_deadlock.spec → test/specs/rll_deadlock.spec
diff --git a/specs/rll_mix.spec → test/specs/rll_mix.spec b/specs/rll_mix.spec → test/specs/rll_mix.spec
diff --git a/specs/rll_subtrans.spec → test/specs/rll_subtrans.spec b/specs/rll_subtrans.spec → test/specs/rll_subtrans.spec
diff --git a/specs/table_lock_test.spec → test/specs/table_lock_test.spec b/specs/table_lock_test.spec → test/specs/table_lock_test.spec
diff --git a/specs/uniq.spec → test/specs/uniq.spec b/specs/uniq.spec → test/specs/uniq.spec
diff --git a/sql/alter_type.sql → test/sql/alter_type.sql b/sql/alter_type.sql → test/sql/alter_type.sql
diff --git a/sql/bitmap_scan.sql → test/sql/bitmap_scan.sql b/sql/bitmap_scan.sql → test/sql/bitmap_scan.sql
diff --git a/sql/btree_compression.sql → test/sql/btree_compression.sql b/sql/btree_compression.sql → test/sql/btree_compression.sql
diff --git a/sql/btree_print.sql → test/sql/btree_print.sql b/sql/btree_print.sql → test/sql/btree_print.sql
diff --git a/sql/btree_sys_check.sql → test/sql/btree_sys_check.sql b/sql/btree_sys_check.sql → test/sql/btree_sys_check.sql
diff --git a/sql/composite_pk_quals.sql → test/sql/composite_pk_quals.sql b/sql/composite_pk_quals.sql → test/sql/composite_pk_quals.sql
diff --git a/sql/createas.sql → test/sql/createas.sql b/sql/createas.sql → test/sql/createas.sql
diff --git a/sql/ddl.sql → test/sql/ddl.sql b/sql/ddl.sql → test/sql/ddl.sql
diff --git a/sql/explain.sql → test/sql/explain.sql b/sql/explain.sql → test/sql/explain.sql
diff --git a/sql/foreign_keys.sql → test/sql/foreign_keys.sql b/sql/foreign_keys.sql → test/sql/foreign_keys.sql
diff --git a/sql/generated.sql → test/sql/generated.sql b/sql/generated.sql → test/sql/generated.sql
diff --git a/sql/getsomeattrs.sql → test/sql/getsomeattrs.sql b/sql/getsomeattrs.sql → test/sql/getsomeattrs.sql
diff --git a/sql/indices.sql → test/sql/indices.sql b/sql/indices.sql → test/sql/indices.sql
diff --git a/sql/indices_build.sql → test/sql/indices_build.sql b/sql/indices_build.sql → test/sql/indices_build.sql
diff --git a/sql/inherits.sql → test/sql/inherits.sql b/sql/inherits.sql → test/sql/inherits.sql
diff --git a/sql/ioc.sql → test/sql/ioc.sql b/sql/ioc.sql → test/sql/ioc.sql
diff --git a/sql/joins.sql → test/sql/joins.sql b/sql/joins.sql → test/sql/joins.sql
diff --git a/sql/nulls.sql → test/sql/nulls.sql b/sql/nulls.sql → test/sql/nulls.sql
diff --git a/sql/opclass.sql → test/sql/opclass.sql b/sql/opclass.sql → test/sql/opclass.sql
diff --git a/sql/parallel_scan.sql → test/sql/parallel_scan.sql b/sql/parallel_scan.sql → test/sql/parallel_scan.sql
diff --git a/sql/partial.sql → test/sql/partial.sql b/sql/partial.sql → test/sql/partial.sql
diff --git a/sql/partition.sql → test/sql/partition.sql b/sql/partition.sql → test/sql/partition.sql
diff --git a/sql/primary_key.sql → test/sql/primary_key.sql b/sql/primary_key.sql → test/sql/primary_key.sql
diff --git a/sql/row_level_locks.sql → test/sql/row_level_locks.sql b/sql/row_level_locks.sql → test/sql/row_level_locks.sql
diff --git a/sql/row_security.sql → test/sql/row_security.sql b/sql/row_security.sql → test/sql/row_security.sql
diff --git a/sql/subquery.sql → test/sql/subquery.sql b/sql/subquery.sql → test/sql/subquery.sql
diff --git a/sql/subtransactions.sql → test/sql/subtransactions.sql b/sql/subtransactions.sql → test/sql/subtransactions.sql
diff --git a/sql/tableam.sql → test/sql/tableam.sql b/sql/tableam.sql → test/sql/tableam.sql
diff --git a/sql/temp.sql → test/sql/temp.sql b/sql/temp.sql → test/sql/temp.sql
diff --git a/sql/toast.sql → test/sql/toast.sql b/sql/toast.sql → test/sql/toast.sql
diff --git a/sql/toast_column_compress.sql → test/sql/toast_column_compress.sql b/sql/toast_column_compress.sql → test/sql/toast_column_compress.sql
diff --git a/sql/trigger.sql → test/sql/trigger.sql b/sql/trigger.sql → test/sql/trigger.sql
diff --git a/sql/truncate.sql → test/sql/truncate.sql b/sql/truncate.sql → test/sql/truncate.sql
diff --git a/sql/types.sql → test/sql/types.sql b/sql/types.sql → test/sql/types.sql
diff --git a/test/t/__init__.py b/test/t/__init__.py
diff --git a/t/base_test.py → test/t/base_test.py b/t/base_test.py → test/t/base_test.py
diff --git a/t/checkpoint_concurrent_test.py → test/t/checkpoint_concurrent_test.py b/t/checkpoint_concurrent_test.py → test/t/checkpoint_concurrent_test.py
diff --git a/t/checkpoint_eviction_test.py → test/t/checkpoint_eviction_test.py b/t/checkpoint_eviction_test.py → test/t/checkpoint_eviction_test.py
diff --git a/t/checkpoint_same_trx_test.py → test/t/checkpoint_same_trx_test.py b/t/checkpoint_same_trx_test.py → test/t/checkpoint_same_trx_test.py
diff --git a/t/checkpoint_split1_test.py → test/t/checkpoint_split1_test.py b/t/checkpoint_split1_test.py → test/t/checkpoint_split1_test.py
diff --git a/t/checkpoint_split2_test.py → test/t/checkpoint_split2_test.py b/t/checkpoint_split2_test.py → test/t/checkpoint_split2_test.py
diff --git a/t/checkpoint_split3_test.py → test/t/checkpoint_split3_test.py b/t/checkpoint_split3_test.py → test/t/checkpoint_split3_test.py
diff --git a/t/checkpoint_split_base_test.py → test/t/checkpoint_split_base_test.py b/t/checkpoint_split_base_test.py → test/t/checkpoint_split_base_test.py
diff --git a/t/checkpoint_update_base_test.py → test/t/checkpoint_update_base_test.py b/t/checkpoint_update_base_test.py → test/t/checkpoint_update_base_test.py
diff --git a/t/checkpoint_update_compress_test.py → test/t/checkpoint_update_compress_test.py b/t/checkpoint_update_compress_test.py → test/t/checkpoint_update_compress_test.py
diff --git a/t/checkpoint_update_test.py → test/t/checkpoint_update_test.py b/t/checkpoint_update_test.py → test/t/checkpoint_update_test.py
diff --git a/t/checkpointer_test.py → test/t/checkpointer_test.py b/t/checkpointer_test.py → test/t/checkpointer_test.py
diff --git a/t/collate_test.py → test/t/collate_test.py b/t/collate_test.py → test/t/collate_test.py
diff --git a/t/ddl_test.py → test/t/ddl_test.py b/t/ddl_test.py → test/t/ddl_test.py
diff --git a/t/eviction_bgwriter_test.py → test/t/eviction_bgwriter_test.py b/t/eviction_bgwriter_test.py → test/t/eviction_bgwriter_test.py
diff --git a/t/eviction_compression_test.py → test/t/eviction_compression_test.py b/t/eviction_compression_test.py → test/t/eviction_compression_test.py
diff --git a/t/eviction_full_memory_test.py → test/t/eviction_full_memory_test.py b/t/eviction_full_memory_test.py → test/t/eviction_full_memory_test.py
diff --git a/t/eviction_test.py → test/t/eviction_test.py b/t/eviction_test.py → test/t/eviction_test.py
diff --git a/t/file_operations_test.py → test/t/file_operations_test.py b/t/file_operations_test.py → test/t/file_operations_test.py
diff --git a/t/files_test.py → test/t/files_test.py b/t/files_test.py → test/t/files_test.py
diff --git a/t/include_indices_test.py → test/t/include_indices_test.py b/t/include_indices_test.py → test/t/include_indices_test.py
diff --git a/t/incomplete_split_test.py → test/t/incomplete_split_test.py b/t/incomplete_split_test.py → test/t/incomplete_split_test.py
diff --git a/t/indices_build_test.py → test/t/indices_build_test.py b/t/indices_build_test.py → test/t/indices_build_test.py
diff --git a/t/logical_test.py → test/t/logical_test.py b/t/logical_test.py → test/t/logical_test.py
diff --git a/t/merge_into_test.py → test/t/merge_into_test.py b/t/merge_into_test.py → test/t/merge_into_test.py
diff --git a/t/merge_test.py → test/t/merge_test.py b/t/merge_test.py → test/t/merge_test.py
diff --git a/t/not_supported_yet_test.py → test/t/not_supported_yet_test.py b/t/not_supported_yet_test.py → test/t/not_supported_yet_test.py
diff --git a/t/o_tables_2_test.py → test/t/o_tables_2_test.py b/t/o_tables_2_test.py → test/t/o_tables_2_test.py
diff --git a/t/o_tables_test.py → test/t/o_tables_test.py b/t/o_tables_test.py → test/t/o_tables_test.py
diff --git a/t/parallel_test.py → test/t/parallel_test.py b/t/parallel_test.py → test/t/parallel_test.py
diff --git a/t/recovery_opclass_test.py → test/t/recovery_opclass_test.py b/t/recovery_opclass_test.py → test/t/recovery_opclass_test.py
diff --git a/t/recovery_test.py → test/t/recovery_test.py b/t/recovery_test.py → test/t/recovery_test.py
diff --git a/t/recovery_worker_test.py → test/t/recovery_worker_test.py b/t/recovery_worker_test.py → test/t/recovery_worker_test.py
diff --git a/t/reindex_test.py → test/t/reindex_test.py b/t/reindex_test.py → test/t/reindex_test.py
diff --git a/t/replication_test.py → test/t/replication_test.py b/t/replication_test.py → test/t/replication_test.py
diff --git a/t/rewrite_test.py → test/t/rewrite_test.py b/t/rewrite_test.py → test/t/rewrite_test.py
diff --git a/t/s3_base_test.py → test/t/s3_base_test.py b/t/s3_base_test.py → test/t/s3_base_test.py
@@ -243,7 +243,7 @@ def __init__(self,
 	def download(self, path, verbose=False):
 		dir_path = os.path.dirname(os.path.realpath(__file__))
 		old_argv = sys.argv
-		sys.argv = [f"{dir_path}/../orioledb_s3_loader.py"]
+		sys.argv = [f"{dir_path}/../../orioledb_s3_loader.py"]
 		sys.argv += ["--endpoint", self._endpoint_url]
 		if self._prefix:
 			sys.argv += ["--prefix", self._prefix]

diff --git a/t/s3_inherits_test.py → test/t/s3_inherits_test.py b/t/s3_inherits_test.py → test/t/s3_inherits_test.py
diff --git a/t/s3_test.py → test/t/s3_test.py b/t/s3_test.py → test/t/s3_test.py
diff --git a/t/s3_unlogged_test.py → test/t/s3_unlogged_test.py b/t/s3_unlogged_test.py → test/t/s3_unlogged_test.py
diff --git a/t/schema_test.py → test/t/schema_test.py b/t/schema_test.py → test/t/schema_test.py
diff --git a/t/toast_index_test.py → test/t/toast_index_test.py b/t/toast_index_test.py → test/t/toast_index_test.py
diff --git a/t/trigger_test.py → test/t/trigger_test.py b/t/trigger_test.py → test/t/trigger_test.py
diff --git a/t/types_test.py → test/t/types_test.py b/t/types_test.py → test/t/types_test.py
@@ -19,7 +19,7 @@ def setUpClass(cls):
 	@classmethod
 	def parse_sys_tree_names(cls):
 		dirname = os.path.dirname(__file__)
-		filename = os.path.join(dirname, '../include/catalog/sys_trees.h')
+		filename = os.path.join(dirname, '../../include/catalog/sys_trees.h')
 		f = open(filename, 'r')
 		pattern = re.compile(r"^#define SYS_TREES_(\w+)\s+\((\d+)\)")
 		line = f.readline()

diff --git a/t/undo_eviction_test.py → test/t/undo_eviction_test.py b/t/undo_eviction_test.py → test/t/undo_eviction_test.py
diff --git a/t/unlogged_test.py → test/t/unlogged_test.py b/t/unlogged_test.py → test/t/unlogged_test.py
diff --git a/t/vacuum_test.py → test/t/vacuum_test.py b/t/vacuum_test.py → test/t/vacuum_test.py