Integrate atomic exercise as a final task in race exercise. #533
Conversation
There was a problem hiding this comment.
The tests are failing because the top level CMakeLists.txt for exercises still tries to compile the subdirectory called atomic. I've fixed it but could not puch to your branch. Thus I've created #534 to test it, but you may want to fix your version.
Otherwise all fine for me.
|
Similarly, the atomic repo was linked to in ExerciseSchedule_AdvancedCourse.md file. Also fixedin #534 |
|
and also the CheatSheet. Now also fixed |
|
There is now on top a merge conflict (fixed in #524) but on top tests are failing. The atomic ones, it's kind of normal as the ci-test has a list of tests harcoded. So I've removed the atomic one, but I do not manage to convince gitlab to run the new version. If you have an idea... Now there is also a failure for the race test : the CMakeLists.txt uses solution1 and solution2 targets without declaring them it seems. |
|
Looks much better. Can you please rebase on master and force push the result ? We try to have a linear history. |
|
@sponce, j'ai fini par en venir à bout. |
|
J'ai essayé de rebaser... c'est bon ? |
|
@sponce , it seems rebasing brought me a dead link in the clang-format section of the CheatSheet... |
|
The dead link was a false positive (basically the llvm site must have been in troubles when the check was done). On the other hand, git still says "This branch cannot be rebased due to conflicts". Do you want me to try it ? |
|
At last, all checks have passed ! I got several times to put back the section "condition_variables" in ExerciceSchedule_AdvancedCourse.md. |
|
I did not touch condition_variables recently, but probably someone did. The problem was that you've merged master into your branch at some stage. And thus the rebase was reapplying some master changes on itself. This may conflict if other changes were done afterward. Anyway, all ready, I'm merging |
The two exercises start from the same code, and go strongly together. I suggest we absorb atomic into race, as a final step.