includeos
diff --git a/‎test/test.sh‎
Lines changed: 2 additions & 2 deletions b/‎test/test.sh‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎…integration/kernel/paging/CMakeLists.txt‎ ‎…integration/memory/paging/CMakeLists.txt‎test/tests-integration/kernel/paging/CMakeLists.txt renamed to test/tests-integration/memory/paging/CMakeLists.txt b/‎…integration/kernel/paging/CMakeLists.txt‎ ‎…integration/memory/paging/CMakeLists.txt‎test/tests-integration/kernel/paging/CMakeLists.txt renamed to test/tests-integration/memory/paging/CMakeLists.txt
diff --git a/‎…ts-integration/kernel/paging/service.cpp‎ ‎…ts-integration/memory/paging/service.cpp‎test/tests-integration/kernel/paging/service.cpp renamed to test/tests-integration/memory/paging/service.cpp b/‎…ts-integration/kernel/paging/service.cpp‎ ‎…ts-integration/memory/paging/service.cpp‎test/tests-integration/kernel/paging/service.cpp renamed to test/tests-integration/memory/paging/service.cpp
diff --git a/‎…/tests-integration/kernel/paging/test.py‎ ‎…/tests-integration/memory/paging/test.py‎test/tests-integration/kernel/paging/test.py renamed to test/tests-integration/memory/paging/test.py b/‎…/tests-integration/kernel/paging/test.py‎ ‎…/tests-integration/memory/paging/test.py‎test/tests-integration/kernel/paging/test.py renamed to test/tests-integration/memory/paging/test.py
diff --git a/‎…/tests-integration/kernel/paging/vm.json‎ ‎…/tests-integration/memory/paging/vm.json‎test/tests-integration/kernel/paging/vm.json renamed to test/tests-integration/memory/paging/vm.json b/‎…/tests-integration/kernel/paging/vm.json‎ ‎…/tests-integration/memory/paging/vm.json‎test/tests-integration/kernel/paging/vm.json renamed to test/tests-integration/memory/paging/vm.json
@@ -79,13 +79,13 @@ multicore_subset(){
   # The following tests are not using multiple CPU's, but have been equippedd with some anyway
   # to make sure core functionality is not broken by missing locks etc. when waking up more cores.
   nix-shell ./unikernel.nix --arg smp true $CCACHE_FLAG --argstr unikernel ${INTEGRATION_TESTS}/net/udp --arg doCheck true
-  nix-build ./unikernel.nix --arg smp true $CCACHE_FLAG --argstr unikernel ${INTEGRATION_TESTS}/kernel/paging --arg doCheck true
+  nix-build ./unikernel.nix --arg smp true $CCACHE_FLAG --argstr unikernel ${INTEGRATION_TESTS}/memory/paging --arg doCheck true
 }
 
 smoke_tests(){
   nix-shell ./unikernel.nix $CCACHE_FLAG --argstr unikernel ${INTEGRATION_TESTS}/net/udp --arg doCheck true
   nix-shell ./unikernel.nix $CCACHE_FLAG --argstr unikernel ${INTEGRATION_TESTS}/net/tcp --arg doCheck true
-  nix-build ./unikernel.nix $CCACHE_FLAG --argstr unikernel ${INTEGRATION_TESTS}/kernel/paging --arg doCheck true
+  nix-build ./unikernel.nix $CCACHE_FLAG --argstr unikernel ${INTEGRATION_TESTS}/memory/paging --arg doCheck true
   nix-build ./unikernel.nix $CCACHE_FLAG --argstr unikernel ${INTEGRATION_TESTS}/kernel/smp --arg doCheck true
 }
Original file line number	Diff line number	Diff line change
`@@ -79,13 +79,13 @@ multicore_subset(){`
`79`	`79`	`# The following tests are not using multiple CPU's, but have been equippedd with some anyway`
`80`	`80`	`# to make sure core functionality is not broken by missing locks etc. when waking up more cores.`
`81`	`81`	`nix-shell ./unikernel.nix --arg smp true $CCACHE_FLAG --argstr unikernel ${INTEGRATION_TESTS}/net/udp --arg doCheck true`
`82`		`- nix-build ./unikernel.nix --arg smp true $CCACHE_FLAG --argstr unikernel ${INTEGRATION_TESTS}/kernel/paging --arg doCheck true`
	`82`	`+ nix-build ./unikernel.nix --arg smp true $CCACHE_FLAG --argstr unikernel ${INTEGRATION_TESTS}/memory/paging --arg doCheck true`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`smoke_tests(){`
`86`	`86`	`nix-shell ./unikernel.nix $CCACHE_FLAG --argstr unikernel ${INTEGRATION_TESTS}/net/udp --arg doCheck true`
`87`	`87`	`nix-shell ./unikernel.nix $CCACHE_FLAG --argstr unikernel ${INTEGRATION_TESTS}/net/tcp --arg doCheck true`
`88`		`- nix-build ./unikernel.nix $CCACHE_FLAG --argstr unikernel ${INTEGRATION_TESTS}/kernel/paging --arg doCheck true`
	`88`	`+ nix-build ./unikernel.nix $CCACHE_FLAG --argstr unikernel ${INTEGRATION_TESTS}/memory/paging --arg doCheck true`
`89`	`89`	`nix-build ./unikernel.nix $CCACHE_FLAG --argstr unikernel ${INTEGRATION_TESTS}/kernel/smp --arg doCheck true`
`90`	`90`	`}`
`91`	`91`