Skip to content
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.

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

Copied Files but could not get tests to run #58

Open
wants to merge 56 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
2480682
Changed travis
Jul 24, 2018
6e4ed09
Uncommented broken test
Jul 24, 2018
e6cdce7
Fixed self made error in SAT
Jul 24, 2018
e6fa4ad
Fixed unforced error
Jul 24, 2018
413bdd7
added a hello message
Jul 24, 2018
429d903
trying to fix errors
Jul 24, 2018
7cfdaa5
trying to echo contents of file
Jul 24, 2018
6953d88
edited echo message
Jul 24, 2018
1cae1e7
Edited echo message again
Jul 24, 2018
5ed2d10
trying to for loop through text file
Jul 24, 2018
1cb7112
trying to make syntax errors go away
Jul 24, 2018
9a892e6
Added an equal sign to the one test case
Jul 24, 2018
d72e8d4
Trying to make docker image work
marcdefaria Jul 26, 2018
8c5a22e
Just trying to docker build
marcdefaria Jul 26, 2018
512447e
image docker
marcdefaria Jul 26, 2018
804aa9f
docker image
marcdefaria Jul 26, 2018
b233aaa
docker attempt
marcdefaria Jul 26, 2018
bbd7515
reverted to original travis.yml
marcdefaria Jul 26, 2018
c831331
added sudo: required
marcdefaria Jul 26, 2018
c384c2d
added services: docker
marcdefaria Jul 26, 2018
35d470a
trying to install docker
marcdefaria Jul 26, 2018
39b9c38
trying to install docker-ce
marcdefaria Jul 26, 2018
9a9cf71
added serices: docker
marcdefaria Jul 26, 2018
ad9a54f
added before_install
marcdefaria Jul 26, 2018
8521129
trying to fix before_installll
marcdefaria Jul 26, 2018
aaea4ae
trying to set up docker again
marcdefaria Jul 26, 2018
0c3df33
fixing before_script
marcdefaria Jul 26, 2018
d28b264
added a docker-compose.yml file
marcdefaria Jul 26, 2018
724cdae
fixing docker compose
marcdefaria Jul 26, 2018
8e79d82
Added after_script
marcdefaria Jul 26, 2018
cc1ab1c
added before_script stuff
marcdefaria Jul 26, 2018
18e44f0
trying to fix before_script
marcdefaria Jul 26, 2018
0322502
added docker ps
marcdefaria Jul 26, 2018
f5471c7
added a docker hello-world
marcdefaria Jul 26, 2018
d5bd7e3
added docker run -t -i ant
marcdefaria Jul 26, 2018
0888c5b
added docker images
marcdefaria Jul 26, 2018
9816108
added volumes to docker-compose.yml
marcdefaria Jul 26, 2018
482bfd4
made a few chagnes on dockerfile
marcdefaria Jul 26, 2018
be88478
removed dockerfile: Dockerfile from docker-compose.yml
marcdefaria Jul 26, 2018
685cc09
added 'RUN ant' to dockerfile
marcdefaria Jul 26, 2018
b358065
removed docker run helloworld
marcdefaria Jul 26, 2018
08c33f3
Added verbose output and failing test case
Jul 31, 2018
6bec708
Changed dockerfile to get tests cases from my github
Jul 31, 2018
e36b4bf
Corrected failing test case
Jul 31, 2018
0dd13ee
Added build status of travis to repo
Jul 31, 2018
8a755ca
Corrected README.md file
Jul 31, 2018
6e6dde1
Added 2 new test cases to canonizer
Jul 31, 2018
8719fc5
Added import for first test to EntireSuite.java
marcdefaria Aug 11, 2018
f6abdb3
Moved test cases to service/simplify
marcdefaria Aug 11, 2018
b0ee022
deleted entireSuite.java
marcdefaria Aug 12, 2018
bfc2f9f
Added EntireSuite.java back
marcdefaria Aug 12, 2018
7cf5524
Removed /canonizer
marcdefaria Aug 12, 2018
23eaaa2
Added canonizer back
marcdefaria Aug 12, 2018
30d444d
Added simplify folder with tests to green/src/.../service
Aug 12, 2018
a41f98b
Added OnlyConstantPropogationService.java
marcdefaria Aug 13, 2018
5afe89a
Created the Constant Propogation tests, but still cant get tests to run
marcdefaria Aug 13, 2018
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
12 changes: 10 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
sudo: required
dist: trusty

services: docker

language: java

script:
- ant;
- ant test;
- docker-compose up --build -d
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We use docker-compose when we want to write multi-container Docker applications. You don't have to use it here and can simply build it with "docker build".

- docker ps -a

after_script:
- docker-compose down
Binary file added .travis.yml.swp
Binary file not shown.
6 changes: 5 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN apt install patchelf -y
RUN apt install libgomp1

# Clone down the GreenSolver repository
RUN git clone https://github.com/wvisser/green
RUN git clone https://github.com/marcdefaria/green

# Download and extract Z3
RUN mkdir z3
Expand All @@ -35,3 +35,7 @@ RUN mv z3-4.7.1-x64-ubuntu-16.04/ z3/
WORKDIR /green/
RUN sed -i '16s/.*/z3path = \/z3\/z3\/bin\/z3/' build.properties
RUN sed -i '17s/.*/z3lib = \/z3\/z3\/bin/' build.properties

#run the test
RUN ant
RUN ant test
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[![Build Status](https://travis-ci.org/wvisser/green.svg?branch=master)](https://travis-ci.org/wvisser/green.svg?branch=master)
[![Build Status](https://travis-ci.org/marcdefaria/green.svg?branch=master)](https://travis-ci.org/marcdefaria/green)

Notes:

HvQSDNw9jQZYGx6mw8N0Bg
The first step is to update "build.properties" with your local
settings. You do not need to set z3 and latte, but in that case
some unit tests won't run.
Expand Down
6 changes: 3 additions & 3 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@
<target name="test">
<echo message="java.library.path = ${z3lib};${cvc3lib}"/>
<mkdir dir="${junit.dir}"/>
<junit fork="yes" printsummary="withOutAndErr" haltonfailure = "yes">
<formatter type="xml"/>
<junit fork="yes" printsummary="yes" haltonfailure = "yes" showoutput="true">
<formatter type="plain" usefile="false"/>
<test name="za.ac.sun.cs.green.EntireSuite" todir="${junit.dir}"/>
<env key="DYLD_LIBRARY_PATH" value="lib"/>
<env key="LD_LIBRARY_PATH" value="lib"/>
Expand All @@ -108,7 +108,7 @@
<include name="TEST-*.xml"/>
</fileset>
<report format="frames" todir="${junit.dir}"/>
</junitreport>
</junitreport>
</target>

<!--
Expand Down
10 changes: 10 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: '2'
services:
web:
build: .
ports:
- "5000:5000"
volumes:
- .:/code
redis:
image: "redis:alpine"
Loading