suzanne.soy/os-test-framework
1
0
Fork 0
Code Issues 48 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Added two more tests: running under dosbox and as a shell script

Browse Source
This commit is contained in:
Georges Dupéron 2018-07-03 19:16:28 +02:00
parent 5e6f566671
commit 23e9889a50
12 changed files with 212 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -49,6 +49,14 @@ matrix:
apt:
packages:
- bochs-sdl
- env: MODE=gui-sh
sudo: false
- env: MODE=dosbox
sudo: false
addons:
apt:
packages:
- dosbox
- env: MODE=self-test # Ensure that the Makefile works, especially with parallel builds.
script: (cd example-os && make -j 10)
sudo: true

8
README.md
View File

@ -15,3 +15,11 @@ Below are screenshots of an example operating system. This example merely displa
## Bochs
![Latest screenshot of the operating system running in Bochs](https://raw.githubusercontent.com/jsmaniac/travis-os-deploy-artifacts/screenshots-bochs/bochs.png)
## DOSBox (.bat)
![Latest screenshot of the operating system running in dosbox](https://raw.githubusercontent.com/jsmaniac/travis-os-deploy-artifacts/screenshots-dosbox/dosbox.png)
## Unix graphical environment (.sh)
![Latest screenshot of the operating system running in gui-sh](https://raw.githubusercontent.com/jsmaniac/travis-os-deploy-artifacts/screenshots-gui-sh/gui-sh.png)

2
example-os/Makefile
View File

@ -1,5 +1,5 @@
os_filename = os.bat
tests = test/qemu-system-i386 test/qemu-system-arm test/virtualbox test/bochs
tests = test/qemu-system-i386 test/qemu-system-arm test/virtualbox test/bochs test/gui-sh test/dosbox
.PHONY: all
all: $(os_filename) os.ndisasm.disasm os.reasm.asm os.reasm .gitignore test Makefile

9
example-os/os.asm
View File

@ -50,14 +50,19 @@ db 0xaa
;; end of the bootsector, close the sh here-document skipped via : <<'EOF'
db `\n`
db `EOF\n`
db `echo Hello world from sh!\n`
db `echo Hello world by the OS, from sh!\n`
db `while sleep 10; do :; done\n`
db `exit\n`
;; for good measure: go into an infinite loop if the exit did not happen.
db `while :; do sleep 1; done\n`
;; end of the SH section, everything until this point is skipped by MS-DOS batch due to the GOTO'
db `:msdos\n`
db `@cls\n`
db `@echo "hello world" from MS-DOS\n`
db `@echo Hello world by the OS, from MS-DOS!\n`
db `command.com\n`
db `exit\n`
;; for good measure: go into an infinite loop if the exit did not happen.
db `:loop\n`
db `GOTO loop\n`

BIN
test/check-dosbox.sikuli/1530637967171.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 526 B

76
test/check-dosbox.sikuli/check-dosbox.html Normal file
View File

@ -0,0 +1,76 @@
<html>
<head>
<style type="text/css">
.sikuli-code {
font-size: 20px;
font-family: "Osaka-mono", Monospace;
line-height: 1.5em;
display:table-cell;
white-space: pre-wrap; /* css-3 */
white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */
white-space: -pre-wrap; /* Opera 4-6 */
white-space: -o-pre-wrap; /* Opera 7 */
word-wrap: break-word; /* Internet Explorer 5.5+ */
width: 99%; /* remove horizontal scroll-bar when viewing in IE7 */
}
.sikuli-code img {
vertical-align: middle;
margin: 2px;
border: 1px solid #ccc;
padding: 2px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
-moz-box-shadow: 1px 1px 1px gray;
-webkit-box-shadow: 1px 1px 2px gray;
}
.kw {
color: blue;
}
.skw {
color: rgb(63, 127, 127);
}
.str {
color: rgb(128, 0, 0);
}
.dig {
color: rgb(128, 64, 0);
}
.cmt {
color: rgb(200, 0, 200);
}
h2 {
display: inline;
font-weight: normal;
}
.info {
border-bottom: 1px solid #ddd;
padding-bottom: 5px;
margin-bottom: 20px;
display: none;
}
a {
color: #9D2900;
}
body {
font-family: "Trebuchet MS", Arial, Sans-Serif;
}
</style>
</head>
<body>
<div class="info">
<h2>check-dosbox.sikuli</h2> <a href="check-dosbox.zip">(Download this script)</a>
</div>
<pre class="sikuli-code">
<span class="skw">wait</span>(<img src="1530637967171.png" />, <span class="dig">10</span>)
</pre>
</body>
</html>

1
test/check-dosbox.sikuli/check-dosbox.py Normal file
View File

@ -0,0 +1 @@
wait("1530637967171.png", 10)

BIN
test/check-gui-sh.sikuli/1530638293676.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 432 B

76
test/check-gui-sh.sikuli/check-gui-sh.html Normal file
View File

@ -0,0 +1,76 @@
<html>
<head>
<style type="text/css">
.sikuli-code {
font-size: 20px;
font-family: "Osaka-mono", Monospace;
line-height: 1.5em;
display:table-cell;
white-space: pre-wrap; /* css-3 */
white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */
white-space: -pre-wrap; /* Opera 4-6 */
white-space: -o-pre-wrap; /* Opera 7 */
word-wrap: break-word; /* Internet Explorer 5.5+ */
width: 99%; /* remove horizontal scroll-bar when viewing in IE7 */
}
.sikuli-code img {
vertical-align: middle;
margin: 2px;
border: 1px solid #ccc;
padding: 2px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
-moz-box-shadow: 1px 1px 1px gray;
-webkit-box-shadow: 1px 1px 2px gray;
}
.kw {
color: blue;
}
.skw {
color: rgb(63, 127, 127);
}
.str {
color: rgb(128, 0, 0);
}
.dig {
color: rgb(128, 64, 0);
}
.cmt {
color: rgb(200, 0, 200);
}
h2 {
display: inline;
font-weight: normal;
}
.info {
border-bottom: 1px solid #ddd;
padding-bottom: 5px;
margin-bottom: 20px;
display: none;
}
a {
color: #9D2900;
}
body {
font-family: "Trebuchet MS", Arial, Sans-Serif;
}
</style>
</head>
<body>
<div class="info">
<h2>check-gui-sh.sikuli</h2> <a href="check-gui-sh.zip">(Download this script)</a>
</div>
<pre class="sikuli-code">
<span class="skw">wait</span>(<img src="1530638293676.png" />, <span class="dig">10</span>)
</pre>
</body>
</html>

1
test/check-gui-sh.sikuli/check-gui-sh.py Normal file
View File

@ -0,0 +1 @@
wait("1530638293676.png", 10)

17
test/dosbox.sh Executable file
View File

@ -0,0 +1,17 @@
#!/bin/sh
set -e
if test $# -ne 1 || test "$1" = '-h' -o "$1" = '--help'; then
echo "Usage: $0 operating_system_file"
fi
os_filename="$1"
dosbox ${os_filename} &
pid=$!
runsikulix -r test/check-dosbox.sikuli && exitcode=$? || exitcode=$?
./utils/take-screenshots.sh "./deploy-screenshots/$(basename "$0" .sh).png"
kill $pid
exit $exitcode

17
test/gui-sh.sh Executable file
View File

@ -0,0 +1,17 @@
#!/bin/sh
set -e
if test $# -ne 1 || test "$1" = '-h' -o "$1" = '--help'; then
echo "Usage: $0 operating_system_file"
fi
os_filename="$1"
xterm -e ${os_filename} &
pid=$!
runsikulix -r test/check-gui-sh.sikuli && exitcode=$? || exitcode=$?
./utils/take-screenshots.sh "./deploy-screenshots/$(basename "$0" .sh).png"
kill $pid
exit $exitcode