Permalink
Browse files

ACPI test for travis

  • Loading branch information...
BenNottelling authored and copy committed Jan 24, 2018
1 parent d32d677 commit 13a985edb7a42e24fb73d8063fc35fa7fa3419c3
Showing with 20 additions and 2 deletions.
  1. +2 −1 .gitignore
  2. +6 −0 .travis-run-integration-acpi.sh
  3. +1 −0 .travis.yml
  4. +7 −0 Makefile
  5. +4 −1 src/config.js
View
@@ -13,4 +13,5 @@ images/
*.bin
*.img
*.fixture
*.fuse_hidden*
*.fuse_hidden*
*.DS_Store
@@ -0,0 +1,6 @@
#!/usr/bin/env bash
set -e
mkdir -p images
(cd images && curl --compressed -OOOOOOOOOO https://copy.sh/v86/images/{linux.iso,linux3.iso,kolibri.img,windows101.img,os8.dsk,freedos722.img,openbsd.img,oberon.dsk,oberon-boot.dsk})
make build/libv86.js useacpi=true
tests/full/run.js
View
@@ -12,6 +12,7 @@ script:
env:
- TEST_SUITE=unit
- TEST_SUITE=integration
- TEST_SUITE=integration-acpi
- TEST_SUITE=unit-qemu
- TEST_SUITE=nasm
matrix:
View
@@ -6,6 +6,11 @@ NASM_TEST_DIR=./tests/nasm
all: build/v86_all.js
browser: build/v86_all.js
ACPI=false
ifeq ($(useacpi),true)
ACPI=true
endif
# Used for nodejs builds and in order to profile code.
# `debug` gives identifiers a readable name, make sure it doesn't have any side effects.
CLOSURE_READABLE=--formatting PRETTY_PRINT --debug
@@ -92,6 +97,7 @@ build/v86_all.js: $(CLOSURE) src/*.js src/browser/*.js lib/*.js
java -jar $(CLOSURE) \
--js_output_file build/v86_all.js\
--define=DEBUG=false\
--define=ENABLE_ACPI=$(ACPI)\
$(CLOSURE_SOURCE_MAP)\
$(CLOSURE_FLAGS)\
--compilation_level ADVANCED\
@@ -112,6 +118,7 @@ build/libv86.js: $(CLOSURE) src/*.js lib/*.js src/browser/*.js
java -jar $(CLOSURE) \
--js_output_file build/libv86.js\
--define=DEBUG=false\
--define=ENABLE_ACPI=$(ACPI)\
$(CLOSURE_FLAGS)\
--compilation_level SIMPLE\
$(TRANSPILE_ES6_FLAGS)\
View
@@ -38,7 +38,10 @@ var DEBUG_SCREEN_LAYERS = DEBUG && false;
/** @const */
var ENABLE_HPET = DEBUG && false;
/** @const */
/**
* @define {boolean}
* Overridden by closure compiler
*/
var ENABLE_ACPI = false;

0 comments on commit 13a985e

Please sign in to comment.