Fix build (and remove unneeded test file).

This commit is contained in:
Howard Stearns 2016-02-08 09:33:32 -08:00
parent 4a50d7c456
commit 61e521bc63
2 changed files with 1 additions and 36 deletions

View file

@ -1,35 +0,0 @@
"use strict";
/*jslint nomen: true, plusplus: true, vars: true*/
var Vec3, Quat, MyAvatar, Entities, Camera, Script, print;
//
// Created by Howard Stearns
// Copyright 2016 High Fidelity, Inc.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
// test libraries/virtualBaton.js
// All participants should run the test script.
Script.include("../libraries/virtualBaton.31.js");
var TICKER_INTERVAL = 1000; // ms
var baton = virtualBaton({key: 'io.highfidelity.testBaton', debugSend: true, debugFlow: true, debugReceive: true});
var ticker, countDown;
// Tick every TICKER_INTERVAL.
function gotBaton(key) {
print("gotBaton", key);
countDown = 20;
ticker = Script.setInterval(function () {
print("tick");
}, 1000);
}
// If we've lost the baton (e.g., to network problems), stop ticking
// but ask for the baton back (waiting indefinitely to get it).
function lostBaton(key) {
print("lostBaton", key);
Script.clearInterval(ticker);
baton.claim(gotBaton, lostBaton);
}
baton.claim(gotBaton, lostBaton);

View file

@ -4,7 +4,7 @@ enable_testing()
# add the test directories
file(GLOB TEST_SUBDIRS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/*")
list(REMOVE_ITEM TEST_SUBDIRS "CMakeFiles")
list(REMOVE_ITEM TEST_SUBDIRS "CMakeFiles" "mocha")
foreach(DIR ${TEST_SUBDIRS})
if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${DIR}")
set(TEST_PROJ_NAME ${DIR})