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

Abs and rel path #2

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
dd91d97
Makefile and touch command
mogyorosimartin Nov 24, 2019
ab41905
CircleCI config edit
mogyorosimartin Nov 24, 2019
1b795bd
Makefile fix
mogyorosimartin Nov 24, 2019
815597a
Makefile .cpp path fix
mogyorosimartin Nov 24, 2019
73f72ed
Makefile fix and code cleanup
mogyorosimartin Nov 24, 2019
7e2c959
Makefile fix
mogyorosimartin Nov 24, 2019
c95942d
Makefile fix...
mogyorosimartin Nov 24, 2019
264cda4
CircleCI test fix
mogyorosimartin Nov 24, 2019
5870fd0
CircleCI fix #2
mogyorosimartin Nov 24, 2019
979bcd5
CircleCI fix #3
mogyorosimartin Nov 24, 2019
f27a02c
CircleCI fix #4
mogyorosimartin Nov 24, 2019
faaa7a6
CircleCI fix #5
mogyorosimartin Nov 24, 2019
676c077
Absolute and Relative path#1
mogyorosimartin Nov 27, 2019
042127a
Update expectedresult.txt
mogyorosimartin Nov 27, 2019
6949b9d
Absolute and Relative path#2
mogyorosimartin Nov 27, 2019
f831fc9
Merge branch 'devmogy' of https://github.com/Teaching-projects/SZE-Mo…
mogyorosimartin Nov 27, 2019
59d7906
Update expectedresult.txt
mogyorosimartin Nov 27, 2019
a812633
Update expectedresult.txt
mogyorosimartin Nov 27, 2019
7bbadd8
Update expectedresult.txt
mogyorosimartin Nov 27, 2019
72a0c8f
Update expectedresult.txt
mogyorosimartin Nov 27, 2019
f2e1d60
CircleCI xy fix
mogyorosimartin Nov 27, 2019
f96061d
Merge branch 'devmogy' of https://github.com/Teaching-projects/SZE-Mo…
mogyorosimartin Nov 27, 2019
bdb4752
Added more tests to CirleCI
mogyorosimartin Dec 3, 2019
6685047
Clean up
mogyorosimartin Dec 7, 2019
d93c6a3
Clean up
mogyorosimartin Dec 7, 2019
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
16 changes: 12 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,25 @@ jobs:
image: ubuntu-1604:201903-01
steps:
- checkout
- run: 'g++ Project1/*.cpp -std=c++11'
- run: 'make'
- persist_to_workspace:
root: .
paths:
- bin.out
test:
machine:
image: ubuntu-1604:201903-01
steps:
- checkout
- run: './a.out < /.circleci/test.txt > /.circleci/output.txt'
- run: 'diff /.circleci/output.txt /.circleci/expectedresult.txt'
- attach_workspace:
at: .
- run: './bin.out < ./.circleci/test.txt > ./.circleci/output.txt'
- run: 'diff ./.circleci/output.txt ./.circleci/expectedresult.txt'
workflows:
version: 2.1
build_and_test:
jobs:
- build
- test
- test:
requires:
- build
14 changes: 5 additions & 9 deletions .circleci/expectedresult.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
/root>
/root>
Mappa1
/root>
/root/Mappa1>
/root/Mappa1>
Mappa2
/root/Mappa1>
/root>
/~$ /~$ Mappa1
/~$ /~/Mappa1$ /~/Mappa1$ Mappa2
/~/Mappa1$ /~/Mappa1$ /~/Mappa1$ /~$ /~$ Mappa1
file
/~$
File renamed without changes.
6 changes: 5 additions & 1 deletion .circleci/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,9 @@ ls
cd Mappa1
mkdir Mappa2
ls
rm Mappa2
ls
cd ..
exit
touch file
ls
exit
Loading