Skip to content

Improved use of INCLUDEOS_SRC in scripts #824

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alfreb merged 5 commits into from
Sep 13, 2016
Merged

Improved use of INCLUDEOS_SRC in scripts #824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3257f73
Tests: Removed need for specifying IncludeOS_SRC in integration tests
mnordsletten Sep 8, 2016
8cf83ae
test: Enabled the fallback INCLUDEOS_SRC reference in all integration…
mnordsletten Sep 8, 2016
3b996f3
Removed dependency on HOME for default installation location
mnordsletten Sep 8, 2016
a6b131c
Fixed name of image in stress test run.sh
mnordsletten Sep 8, 2016
591df93
Update README.md
mnordsletten Sep 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ IncludeOS is free software, with "no warranties or restrictions of any kind".

## Build status

| | Build from bundle | Build from source |
|--------|---------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------|
| Master | [![Build Status](https://jenkins.includeos.org/buildStatus/icon?job=shield_master_bundle)](https://jenkins.includeos.org/job/shield_master_bundle/) | Coming soon |
| Dev | [![Build Status](https://jenkins.includeos.org/buildStatus/icon?job=shield_dev_bundle)](https://jenkins.includeos.org/job/shield_dev_bundle/) | Coming soon |
| | Build from bundle |
|--------|---------------------------------------------------------------------------------------------------------------------------------------------------------------|
| Master | [![Build Status](https://jenkins.includeos.org/buildStatus/icon?job=shield_master_bundle)](https://jenkins.includeos.org/job/shield_master_bundle/) |
| Dev | [![Build Status](https://jenkins.includeos.org/buildStatus/icon?job=shield_dev_bundle)](https://jenkins.includeos.org/job/shield_dev_bundle/) |

### Key features

Expand Down
3 changes: 2 additions & 1 deletion test/fs/integration/fat16/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
import sys
import os

includeos_src = os.environ['INCLUDEOS_SRC']
includeos_src = os.environ.get('INCLUDEOS_SRC',
os.path.realpath(os.path.join(os.getcwd(), os.path.dirname(__file__))).split('/test')[0])
sys.path.insert(0,includeos_src + "/test")

from subprocess import call
Expand Down
3 changes: 2 additions & 1 deletion test/fs/integration/fat32/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
import sys
import os

includeos_src = os.environ['INCLUDEOS_SRC']
includeos_src = os.environ.get('INCLUDEOS_SRC',
os.path.realpath(os.path.join(os.getcwd(), os.path.dirname(__file__))).split('/test')[0])
sys.path.insert(0,includeos_src + "/test")

from subprocess import call
Expand Down
3 changes: 2 additions & 1 deletion test/fs/integration/memdisk/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
import sys
import os

includeos_src = os.environ['INCLUDEOS_SRC']
includeos_src = os.environ.get('INCLUDEOS_SRC',
os.path.realpath(os.path.join(os.getcwd(), os.path.dirname(__file__))).split('/test')[0])
sys.path.insert(0,includeos_src + "/test")

from subprocess import call
Expand Down
3 changes: 2 additions & 1 deletion test/fs/integration/virtio_block/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
import subprocess
import os

includeos_src = os.environ['INCLUDEOS_SRC']
includeos_src = os.environ.get('INCLUDEOS_SRC',
os.path.realpath(os.path.join(os.getcwd(), os.path.dirname(__file__))).split('/test')[0])
sys.path.insert(0,includeos_src + "/test")
subprocess.call(['./image.sh'])

Expand Down
3 changes: 2 additions & 1 deletion test/hw/integration/serial/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
import sys
import os

includeos_src = os.environ['INCLUDEOS_SRC']
includeos_src = os.environ.get('INCLUDEOS_SRC',
os.path.realpath(os.path.join(os.getcwd(), os.path.dirname(__file__))).split('/test')[0])
sys.path.insert(0,includeos_src + "/test")

from subprocess import call
Expand Down
8 changes: 8 additions & 0 deletions test/hw/integration/virtio_queue/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@ FILES = service.cpp

LOCAL_INCLUDES=-I$(INCLUDEOS_SRC)/test/lest/include/lest -I$(PWD)/mod/GSL/include

# IncludeOS_SRC location
ifndef INCLUDEOS_SRC
current_dir := $(shell pwd)
LOCAL_INCLUDES=-I$(abspath $(current_dir)/../../../lest/include/lest) -I$(abspath $(current_dir)/../../../../mod/GSL/include)
else
LOCAL_INCLUDES=-I$(INCLUDEOS_SRC)/test/lest/include/lest -I$(INCLUDEOS_SRC)/mod/GSL/include
endif

# Your disk image
DISK=

Expand Down
8 changes: 7 additions & 1 deletion test/kernel/integration/custom_init/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,13 @@ SERVICE_NAME = Custom pre-service initialization
# Your service parts
FILES = service.cpp custom_init1.cpp custom_init2.cpp custom_init3.cpp

LOCAL_INCLUDES = -I$(INCLUDEOS_SRC)/test/lest/include/lest
# IncludeOS_SRC location
ifndef INCLUDEOS_SRC
current_dir := $(shell pwd)
LOCAL_INCLUDES=-I$(abspath $(current_dir)/../../../lest/include/lest)
else
LOCAL_INCLUDES=-I$(INCLUDEOS_SRC)/test/lest/include/lest
endif

# Your disk image
DISK=
Expand Down
3 changes: 2 additions & 1 deletion test/kernel/integration/custom_init/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
import sys
import os

includeos_src = os.environ['INCLUDEOS_SRC']
includeos_src = os.environ.get('INCLUDEOS_SRC',
os.path.realpath(os.path.join(os.getcwd(), os.path.dirname(__file__))).split('/test')[0])
sys.path.insert(0,includeos_src + "/test")

import vmrunner
Expand Down
8 changes: 7 additions & 1 deletion test/kernel/integration/memmap/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,13 @@ SERVICE_NAME = Memmap Test Service
# Your service parts
FILES = service.cpp

LOCAL_INCLUDES = -I$(INCLUDEOS_SRC)/test/lest/include/lest
# IncludeOS_SRC location
ifndef INCLUDEOS_SRC
current_dir := $(shell pwd)
LOCAL_INCLUDES=-I$(abspath $(current_dir)/../../../lest/include/lest)
else
LOCAL_INCLUDES=-I$(INCLUDEOS_SRC)/test/lest/include/lest
endif

# Your disk image
DISK=
Expand Down
3 changes: 2 additions & 1 deletion test/kernel/integration/memmap/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
import sys
import os

includeos_src = os.environ['INCLUDEOS_SRC']
includeos_src = os.environ.get('INCLUDEOS_SRC',
os.path.realpath(os.path.join(os.getcwd(), os.path.dirname(__file__))).split('/test')[0])
sys.path.insert(0,includeos_src + "/test")

import vmrunner
Expand Down
3 changes: 2 additions & 1 deletion test/kernel/integration/timers/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
import sys
import os

includeos_src = os.environ['INCLUDEOS_SRC']
includeos_src = os.environ.get('INCLUDEOS_SRC',
os.path.realpath(os.path.join(os.getcwd(), os.path.dirname(__file__))).split('/test')[0])
sys.path.insert(0,includeos_src + "/test")

import vmrunner
Expand Down
8 changes: 8 additions & 0 deletions test/mod/gsl/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@ FILES = service.cpp

LOCAL_INCLUDES=-I$(INCLUDEOS_SRC)/mod/GSL/include -I$(INCLUDEOS_SRC)/test/lest/include/lest

# IncludeOS_SRC location
ifndef INCLUDEOS_SRC
current_dir := $(shell pwd)
LOCAL_INCLUDES=-I$(abspath $(current_dir)/../../../lest/include/lest) -I$(abspath $(current_dir)/../../../../mod/GSL/include)
else
LOCAL_INCLUDES=-I$(INCLUDEOS_SRC)/test/lest/include/lest -I$(INCLUDEOS_SRC)/mod/GSL/include
endif

# Your disk image
DISK=

Expand Down
3 changes: 2 additions & 1 deletion test/mod/gsl/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
import sys
import os

includeos_src = os.environ['INCLUDEOS_SRC']
includeos_src = os.environ.get('INCLUDEOS_SRC',
os.path.realpath(os.path.join(os.getcwd(), os.path.dirname(__file__))).split('/test')[0])
sys.path.insert(0,includeos_src + "/test")

import vmrunner
Expand Down
3 changes: 2 additions & 1 deletion test/net/integration/bufstore/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
import sys
import os

includeos_src = os.environ['INCLUDEOS_SRC']
includeos_src = os.environ.get('INCLUDEOS_SRC',
os.path.realpath(os.path.join(os.getcwd(), os.path.dirname(__file__))).split('/test')[0])
sys.path.insert(0,includeos_src + "/test")

import vmrunner
Expand Down
3 changes: 2 additions & 1 deletion test/net/integration/dhcp/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
import os
import subprocess

includeos_src = os.environ['INCLUDEOS_SRC']
includeos_src = os.environ.get('INCLUDEOS_SRC',
os.path.realpath(os.path.join(os.getcwd(), os.path.dirname(__file__))).split('/test')[0])
sys.path.insert(0,includeos_src + "/test")

import vmrunner
Expand Down
6 changes: 6 additions & 0 deletions test/net/integration/ethernet/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,13 @@ SERVICE_NAME=Ethernet Module Test
# Your service parts
FILES=service.cpp

# IncludeOS_SRC location
ifndef INCLUDEOS_SRC
current_dir := $(shell pwd)
LOCAL_INCLUDES=-I$(abspath $(current_dir)/../../../lest/include/lest)
else
LOCAL_INCLUDES=-I$(INCLUDEOS_SRC)/test/lest/include/lest
endif

# Your disk image
DISK=
Expand Down
3 changes: 2 additions & 1 deletion test/net/integration/ethernet/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
import sys
import os

includeos_src = os.environ['INCLUDEOS_SRC']
includeos_src = os.environ.get('INCLUDEOS_SRC',
os.path.realpath(os.path.join(os.getcwd(), os.path.dirname(__file__))).split('/test')[0])
sys.path.insert(0,includeos_src + "/test")

import vmrunner
Expand Down
6 changes: 6 additions & 0 deletions test/net/integration/ipv4/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,13 @@ SERVICE_NAME=IPv4 Module Test
# Your service parts
FILES=service.cpp

# IncludeOS_SRC location
ifndef INCLUDEOS_SRC
current_dir := $(shell pwd)
LOCAL_INCLUDES=-I$(abspath $(current_dir)/../../../lest/include/lest)
else
LOCAL_INCLUDES=-I$(INCLUDEOS_SRC)/test/lest/include/lest
endif

# Your disk image
DISK=
Expand Down
3 changes: 2 additions & 1 deletion test/net/integration/ipv4/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
import sys
import os

includeos_src = os.environ['INCLUDEOS_SRC']
includeos_src = os.environ.get('INCLUDEOS_SRC',
os.path.realpath(os.path.join(os.getcwd(), os.path.dirname(__file__))).split('/test')[0])
sys.path.insert(0,includeos_src + "/test")

import vmrunner
Expand Down
3 changes: 2 additions & 1 deletion test/net/integration/tcp/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
import sys
import os

includeos_src = os.environ['INCLUDEOS_SRC']
includeos_src = os.environ.get('INCLUDEOS_SRC',
os.path.realpath(os.path.join(os.getcwd(), os.path.dirname(__file__))).split('/test')[0])
sys.path.insert(0,includeos_src + "/test")

import vmrunner
Expand Down
3 changes: 2 additions & 1 deletion test/net/integration/transmit/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
import sys
import os

includeos_src = os.environ['INCLUDEOS_SRC']
includeos_src = os.environ.get('INCLUDEOS_SRC',
os.path.realpath(os.path.join(os.getcwd(), os.path.dirname(__file__))).split('/test')[0])
sys.path.insert(0,includeos_src + "/test")

import vmrunner
Expand Down
4 changes: 3 additions & 1 deletion test/net/integration/udp/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
import sys
import os

includeos_src = os.environ['INCLUDEOS_SRC']
includeos_src = os.environ.get('INCLUDEOS_SRC',
os.path.realpath(os.path.join(os.getcwd(), os.path.dirname(__file__))).split('/test')[0])
print 'includeos_src: {0}'.format(includeos_src)
sys.path.insert(0,includeos_src + "/test")

import vmrunner
Expand Down
8 changes: 7 additions & 1 deletion test/platform/integration/unik/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,13 @@ SERVICE_NAME = Test Unik platform initialization
# Your service parts
FILES = service.cpp

LOCAL_INCLUDES = -I$(INCLUDEOS_SRC)/test/lest/include/lest
# IncludeOS_SRC location
ifndef INCLUDEOS_SRC
current_dir := $(shell pwd)
LOCAL_INCLUDES=-I$(abspath $(current_dir)/../../../lest/include/lest)
else
LOCAL_INCLUDES=-I$(INCLUDEOS_SRC)/test/lest/include/lest
endif

# Your disk image
DISK=
Expand Down
3 changes: 2 additions & 1 deletion test/platform/integration/unik/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
import sys
import os

includeos_src = os.environ['INCLUDEOS_SRC']
includeos_src = os.environ.get('INCLUDEOS_SRC',
os.path.realpath(os.path.join(os.getcwd(), os.path.dirname(__file__))).split('/test')[0])
sys.path.insert(0,includeos_src + "/test")

import vmrunner
Expand Down
3 changes: 2 additions & 1 deletion test/stl/integration/crt/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
import sys
import os

includeos_src = os.environ['INCLUDEOS_SRC']
includeos_src = os.environ.get('INCLUDEOS_SRC',
os.path.realpath(os.path.join(os.getcwd(), os.path.dirname(__file__))).split('/test')[0])
sys.path.insert(0,includeos_src + "/test")

import vmrunner
Expand Down
6 changes: 6 additions & 0 deletions test/stl/integration/exceptions/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,13 @@ FILES = service.cpp
# Your disk image
DISK=

# IncludeOS_SRC location
ifndef INCLUDEOS_SRC
current_dir := $(shell pwd)
LOCAL_INCLUDES=-I$(abspath $(current_dir)/../../../lest/include/lest)
else
LOCAL_INCLUDES=-I$(INCLUDEOS_SRC)/test/lest/include/lest
endif

# IncludeOS location
ifndef INCLUDEOS_INSTALL
Expand Down
3 changes: 2 additions & 1 deletion test/stl/integration/exceptions/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
import sys
import os

includeos_src = os.environ['INCLUDEOS_SRC']
includeos_src = os.environ.get('INCLUDEOS_SRC',
os.path.realpath(os.path.join(os.getcwd(), os.path.dirname(__file__))).split('/test')[0])
sys.path.insert(0,includeos_src + "/test")

import vmrunner
Expand Down
6 changes: 6 additions & 0 deletions test/stl/integration/stl/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,13 @@ SERVICE_NAME = IncludeOS basic STL test
# Your service parts
FILES = service.cpp

# IncludeOS_SRC location
ifndef INCLUDEOS_SRC
current_dir := $(shell pwd)
LOCAL_INCLUDES=-I$(abspath $(current_dir)/../../../lest/include/lest)
else
LOCAL_INCLUDES=-I$(INCLUDEOS_SRC)/test/lest/include/lest
endif

# Your disk image
DISK=
Expand Down
3 changes: 2 additions & 1 deletion test/stl/integration/stl/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
import sys
import os

includeos_src = os.environ['INCLUDEOS_SRC']
includeos_src = os.environ.get('INCLUDEOS_SRC',
os.path.realpath(os.path.join(os.getcwd(), os.path.dirname(__file__))).split('/test')[0])
sys.path.insert(0,includeos_src + "/test")

import vmrunner
Expand Down
6 changes: 6 additions & 0 deletions test/stress/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,13 @@ SERVICE_NAME = IncludeOS stress test
# Your service parts
FILES = service.cpp

# IncludeOS_SRC location
ifndef INCLUDEOS_SRC
current_dir := $(shell pwd)
LOCAL_INCLUDES=-I$(abspath $(current_dir)/../../../lest/include/lest)
else
LOCAL_INCLUDES=-I$(INCLUDEOS_SRC)/test/lest/include/lest
endif

# Your disk image
DISK=
Expand Down
2 changes: 1 addition & 1 deletion test/stress/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#! /bin/bash
source ${INCLUDEOS_HOME-$HOME/IncludeOS_install}/etc/run.sh stresstest.img
source ${INCLUDEOS_HOME-$HOME/IncludeOS_install}/etc/run.sh test_stresstest.img
3 changes: 2 additions & 1 deletion test/stress/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
import subprocess
import os

includeos_src = os.environ['INCLUDEOS_SRC']
includeos_src = os.environ.get('INCLUDEOS_SRC',
os.path.realpath(os.path.join(os.getcwd(), os.path.dirname(__file__))).split('/test')[0])
sys.path.insert(0,includeos_src + "/test")

import vmrunner
Expand Down
2 changes: 1 addition & 1 deletion test/vmrunner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ def poll(self):

print color.HEADER("IncludeOS vmrunner initializing tests")
print color.INFO(nametag), "Validating test service"
validate_test.load_schema(os.environ["INCLUDEOS_SRC"] + "/test/vm.schema.json")
validate_test.load_schema(os.environ.get("INCLUDEOS_SRC", os.path.realpath(os.path.join(os.getcwd(), os.path.dirname(__file__))).split('/test')[0]) + "/test/vm.schema.json")
validate_test.has_required_stuff(".")

default_spec = {"image" : "test.img"}
Expand Down